And finally renamed the classes themselves.

Relates to http://opensimulator.org/mantis/view.php?id=7398

OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs

@@ -42,7 +42,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class WebFetchInvDescHandler 
+    public class FetchInvDescHandler 
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -51,7 +51,7 @@ namespace OpenSim.Capabilities.Handlers
         private ILibraryService m_LibraryService;
 //        private object m_fetchLock = new Object();
 
-        public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
+        public FetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
         {
             m_InventoryService = invService;
             m_LibraryService = libService;
@@ -211,9 +211,9 @@ namespace OpenSim.Capabilities.Handlers
             UUID agentID, UUID folderID, UUID ownerID,
             bool fetchFolders, bool fetchItems, int sortOrder, out int version, out int descendents)
         {
-//            m_log.DebugFormat(
-//                "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
-//                fetchFolders, fetchItems, folderID, agentID);
+            //m_log.DebugFormat(
+            //    "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
+            //    fetchFolders, fetchItems, folderID, agentID);
 
             // FIXME MAYBE: We're not handling sortOrder!
 

OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescServerConnector.cs

@@ -35,13 +35,13 @@ using OpenMetaverse;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class WebFetchInvDescServerConnector : ServiceConnector
+    public class FetchInvDescServerConnector : ServiceConnector
     {
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
         private string m_ConfigName = "CapsService";
 
-        public WebFetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) :
+        public FetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) :
                 base(config, server, configName)
         {
             if (configName != String.Empty)
@@ -67,13 +67,13 @@ namespace OpenSim.Capabilities.Handlers
             m_LibraryService =
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
-            WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            FetchInvDescHandler webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService);
             IRequestHandler reqHandler
                 = new RestStreamHandler(
                     "POST",
                     "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
                     webFetchHandler.FetchInventoryDescendentsRequest,
-                    "WebFetchInvDesc",
+                    "FetchInvDescendents",
                     null);
             server.AddStreamHandler(reqHandler);
         }

OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs

@@ -814,7 +814,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"]));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -833,7 +833,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"]));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -854,8 +854,8 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["profileImage"]));
-                                    data.Add(new OSDString((string)reader["profileFirstImage"]));
+                                    data.Add(new OSDString(reader["profileImage"].ToString()));
+                                    data.Add(new OSDString(reader["profileFirstImage"].ToString()));
                                 }
                             }
                         }
@@ -864,7 +864,7 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.Error("[PROFILES_DATA]: GetAvatarNotes exception ", e);
+                m_log.Error("[PROFILES_DATA]: GetUserImageAssets exception ", e);
             }
 
             return data;

OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs

@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden
         private string m_fetchInventoryDescendents2Url;
         private string m_webFetchInventoryDescendentsUrl;
 
-        private static WebFetchInvDescHandler m_webFetchHandler;
+        private static FetchInvDescHandler m_webFetchHandler;
 
         private static Thread[] m_workerThreads = null;
 
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack.Linden
             m_LibraryService = Scene.LibraryService;
 
             // We'll reuse the same handler for all requests.
-            m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            m_webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService);
 
             Scene.EventManager.OnRegisterCaps += RegisterCaps;