aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs16
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs17
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs3
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs7
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs2
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs4
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs7
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs4
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs28
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs38
-rw-r--r--OpenSim/Services/InventoryService/XInventoryService.cs7
17 files changed, 78 insertions, 79 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 4add1ca..db81fb9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2724,7 +2724,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2724 DirPlacesReplyPacket.StatusDataBlock[] status = 2724 DirPlacesReplyPacket.StatusDataBlock[] status =
2725 new DirPlacesReplyPacket.StatusDataBlock[0]; 2725 new DirPlacesReplyPacket.StatusDataBlock[0];
2726 2726
2727 int i = 0;
2728 foreach (DirPlacesReplyData d in data) 2727 foreach (DirPlacesReplyData d in data)
2729 { 2728 {
2730 int idx = replies.Length; 2729 int idx = replies.Length;
@@ -2760,7 +2759,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2760 2759
2761 replies = new DirPlacesReplyPacket.QueryRepliesBlock[0]; 2760 replies = new DirPlacesReplyPacket.QueryRepliesBlock[0];
2762 status = new DirPlacesReplyPacket.StatusDataBlock[0]; 2761 status = new DirPlacesReplyPacket.StatusDataBlock[0];
2763
2764 } 2762 }
2765 } 2763 }
2766 2764
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index a3c40e0..420e3ca 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -198,4 +198,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
198 OnInstantMessage(null, msg); 198 OnInstantMessage(null, msg);
199 } 199 }
200 } 200 }
201} 201} \ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index d025f0c..730cc77 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -132,20 +132,21 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
132 { 132 {
133 UUID toAgentID = new UUID(im.toAgentID); 133 UUID toAgentID = new UUID(im.toAgentID);
134 134
135 m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString());
136
137 // Try root avatar only first 135 // Try root avatar only first
138 foreach (Scene scene in m_Scenes) 136 foreach (Scene scene in m_Scenes)
139 { 137 {
140 if (scene.Entities.ContainsKey(toAgentID) && 138 if (scene.Entities.ContainsKey(toAgentID) &&
141 scene.Entities[toAgentID] is ScenePresence) 139 scene.Entities[toAgentID] is ScenePresence)
142 { 140 {
143 m_log.DebugFormat("[INSTANT MESSAGE]: Looking for {0} in {1}", toAgentID.ToString(), scene.RegionInfo.RegionName); 141// m_log.DebugFormat(
144 // Local message 142// "[INSTANT MESSAGE]: Looking for root agent {0} in {1}",
143// toAgentID.ToString(), scene.RegionInfo.RegionName);
144
145 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 145 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
146 if (!user.IsChildAgent) 146 if (!user.IsChildAgent)
147 { 147 {
148 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); 148 // Local message
149 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID);
149 user.ControllingClient.SendInstantMessage(im); 150 user.ControllingClient.SendInstantMessage(im);
150 151
151 // Message sent 152 // Message sent
@@ -167,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
167 // Local message 168 // Local message
168 ScenePresence user = (ScenePresence) scene.Entities[toAgentID]; 169 ScenePresence user = (ScenePresence) scene.Entities[toAgentID];
169 170
170 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering to client"); 171 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID);
171 user.ControllingClient.SendInstantMessage(im); 172 user.ControllingClient.SendInstantMessage(im);
172 173
173 // Message sent 174 // Message sent
@@ -176,6 +177,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
176 } 177 }
177 } 178 }
178 179
180 m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID);
179 SendGridInstantMessageViaXMLRPC(im, result); 181 SendGridInstantMessageViaXMLRPC(im, result);
180 182
181 return; 183 return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 8b77a5f..4117e86 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -32,7 +32,6 @@ using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35
36using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
38using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
@@ -92,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
92 m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>(); 91 m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
93 if (m_TransferModule == null) 92 if (m_TransferModule == null)
94 { 93 {
95 m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only"); 94 m_log.Error("[INVENTORY TRANSFER]: No Message transfer module found, transfers will be local only");
96 m_Enabled = false; 95 m_Enabled = false;
97 96
98 m_Scenelist.Clear(); 97 m_Scenelist.Clear();
@@ -160,8 +159,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
160 159
161 private void OnInstantMessage(IClientAPI client, GridInstantMessage im) 160 private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
162 { 161 {
163 m_log.InfoFormat("[INVENTORY TRANSFER]: OnInstantMessage {0}", im.dialog); 162 m_log.InfoFormat(
164 163 "[INVENTORY TRANSFER]: {0} IM type received from {1}",
164 (InstantMessageDialog)im.dialog, client.Name);
165
165 Scene scene = FindClientScene(client.AgentId); 166 Scene scene = FindClientScene(client.AgentId);
166 167
167 if (scene == null) // Something seriously wrong here. 168 if (scene == null) // Something seriously wrong here.
@@ -185,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
185 { 186 {
186 UUID folderID = new UUID(im.binaryBucket, 1); 187 UUID folderID = new UUID(im.binaryBucket, 1);
187 188
188 m_log.DebugFormat("[AGENT INVENTORY]: Inserting original folder {0} "+ 189 m_log.DebugFormat("[INVENTORY TRANSFER]: Inserting original folder {0} "+
189 "into agent {1}'s inventory", 190 "into agent {1}'s inventory",
190 folderID, new UUID(im.toAgentID)); 191 folderID, new UUID(im.toAgentID));
191 192
@@ -221,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
221 222
222 UUID itemID = new UUID(im.binaryBucket, 1); 223 UUID itemID = new UUID(im.binaryBucket, 1);
223 224
224 m_log.DebugFormat("[AGENT INVENTORY]: (giving) Inserting item {0} "+ 225 m_log.DebugFormat("[INVENTORY TRANSFER]: (giving) Inserting item {0} "+
225 "into agent {1}'s inventory", 226 "into agent {1}'s inventory",
226 itemID, new UUID(im.toAgentID)); 227 itemID, new UUID(im.toAgentID));
227 228
@@ -286,10 +287,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
286 // inventory is loaded. Courtesy of the above bulk update, 287 // inventory is loaded. Courtesy of the above bulk update,
287 // It will have been pushed to the client, too 288 // It will have been pushed to the client, too
288 // 289 //
289
290 //CachedUserInfo userInfo =
291 // scene.CommsManager.UserProfileCacheService.
292 // GetUserDetails(client.AgentId);
293 IInventoryService invService = scene.InventoryService; 290 IInventoryService invService = scene.InventoryService;
294 291
295 InventoryFolderBase trashFolder = 292 InventoryFolderBase trashFolder =
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
index 1e51187..dcf08e3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
@@ -27,15 +27,12 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30
31using OpenMetaverse; 30using OpenMetaverse;
32using Nini.Config; 31using Nini.Config;
33using log4net; 32using log4net;
34
35using OpenSim.Framework; 33using OpenSim.Framework;
36using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
37 35
38
39namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory 36namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
40{ 37{
41 public abstract class BaseInventoryConnector : IInventoryService 38 public abstract class BaseInventoryConnector : IInventoryService
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
index c97ab9e..4e2f602 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/InventoryCache.cs
@@ -161,6 +161,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
161 /// <returns></returns> 161 /// <returns></returns>
162 public InventoryFolderBase GetFolderForType(UUID userID, AssetType type) 162 public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
163 { 163 {
164 m_log.DebugFormat("[INVENTORY CACHE]: Getting folder for asset type {0} for user {1}", type, userID);
165
164 Dictionary<AssetType, InventoryFolderBase> folders = null; 166 Dictionary<AssetType, InventoryFolderBase> folders = null;
165 167
166 lock (m_InventoryCache) 168 lock (m_InventoryCache)
@@ -177,8 +179,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
177 179
178 if ((folders != null) && folders.ContainsKey(type)) 180 if ((folders != null) && folders.ContainsKey(type))
179 { 181 {
182 m_log.DebugFormat(
183 "[INVENTORY CACHE]: Returning folder {0} as type {1} for {2}", folders[type], type, userID);
184
180 return folders[type]; 185 return folders[type];
181 } 186 }
187
188 m_log.WarnFormat("[INVENTORY CACHE]: Could not find folder for system type {0} for {1}", type, userID);
182 189
183 return null; 190 return null;
184 } 191 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 22bd04c..3de6e5c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -223,6 +223,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
223 /// <returns>true if the item was successfully added</returns> 223 /// <returns>true if the item was successfully added</returns>
224 public bool AddItem(InventoryItemBase item) 224 public bool AddItem(InventoryItemBase item)
225 { 225 {
226 m_log.DebugFormat(
227 "[LOCAL INVENTORY SERVICES CONNECTOR]: Adding inventory item {0} to user {1} folder {2}",
228 item.Name, item.Owner, item.Folder);
229
226 return m_InventoryService.AddItem(item); 230 return m_InventoryService.AddItem(item);
227 } 231 }
228 232
@@ -236,7 +240,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
236 return m_InventoryService.UpdateItem(item); 240 return m_InventoryService.UpdateItem(item);
237 } 241 }
238 242
239
240 public bool MoveItems(UUID ownerID, List<InventoryItemBase> items) 243 public bool MoveItems(UUID ownerID, List<InventoryItemBase> items)
241 { 244 {
242 return m_InventoryService.MoveItems(ownerID, items); 245 return m_InventoryService.MoveItems(ownerID, items);
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 153aeec..17d80c7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -75,7 +75,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
75 base.Init(source); 75 base.Init(source);
76 } 76 }
77 77
78
79 #region ISharedRegionModule 78 #region ISharedRegionModule
80 79
81 public void Initialise(IConfigSource source) 80 public void Initialise(IConfigSource source)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 4d84018..4e0ddcb 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -945,7 +945,6 @@ namespace OpenSim.Region.Framework.Scenes
945 945
946 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId) 946 private InventoryItemBase CreateAgentInventoryItemFromTask(UUID destAgent, SceneObjectPart part, UUID itemId)
947 { 947 {
948 Console.WriteLine("CreateAgentInventoryItemFromTask");
949 TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId); 948 TaskInventoryItem taskItem = part.Inventory.GetInventoryItem(itemId);
950 949
951 if (null == taskItem) 950 if (null == taskItem)
@@ -1016,7 +1015,10 @@ namespace OpenSim.Region.Framework.Scenes
1016 /// <param name="itemID"></param> 1015 /// <param name="itemID"></param>
1017 public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId) 1016 public InventoryItemBase MoveTaskInventoryItem(IClientAPI remoteClient, UUID folderId, SceneObjectPart part, UUID itemId)
1018 { 1017 {
1019 m_log.Info("Adding task inventory"); 1018 m_log.DebugFormat(
1019 "[PRIM INVENTORY]: Adding item {0} from {1} to folder {2} for {3}",
1020 itemId, part.Name, folderId, remoteClient.Name);
1021
1020 InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId); 1022 InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(remoteClient.AgentId, part, itemId);
1021 1023
1022 if (agentItem == null) 1024 if (agentItem == null)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index b050349..8102acd 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1294,7 +1294,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1294 { 1294 {
1295 sdoc.LoadXml(xml); 1295 sdoc.LoadXml(xml);
1296 } 1296 }
1297 catch (System.Xml.XmlException e) 1297 catch (System.Xml.XmlException)
1298 { 1298 {
1299 loadedState = false; 1299 loadedState = false;
1300 } 1300 }
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
index d7a5731..36b5083 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs
@@ -156,8 +156,6 @@ namespace OpenSim.Services.Connectors
156 156
157 sendData["METHOD"] = "storefriend"; 157 sendData["METHOD"] = "storefriend";
158 158
159 string reqString = ServerUtils.BuildQueryString(sendData);
160
161 string reply = string.Empty; 159 string reply = string.Empty;
162 try 160 try
163 { 161 {
@@ -199,8 +197,6 @@ namespace OpenSim.Services.Connectors
199 sendData["FRIEND"] = Friend; 197 sendData["FRIEND"] = Friend;
200 sendData["METHOD"] = "deletefriend"; 198 sendData["METHOD"] = "deletefriend";
201 199
202 string reqString = ServerUtils.BuildQueryString(sendData);
203
204 string reply = string.Empty; 200 string reply = string.Empty;
205 try 201 try
206 { 202 {
@@ -232,10 +228,8 @@ namespace OpenSim.Services.Connectors
232 m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend received null reply"); 228 m_log.DebugFormat("[FRIENDS CONNECTOR]: DeleteFriend received null reply");
233 229
234 return false; 230 return false;
235
236 } 231 }
237 232
238 #endregion 233 #endregion
239
240 } 234 }
241} 235} \ No newline at end of file
diff --git a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
index 291dd73..024b42d 100644
--- a/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
@@ -31,11 +31,9 @@ using System.Collections.Generic;
31using System.Drawing; 31using System.Drawing;
32using System.Net; 32using System.Net;
33using System.Reflection; 33using System.Reflection;
34
35using OpenSim.Framework; 34using OpenSim.Framework;
36using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
37using GridRegion = OpenSim.Services.Interfaces.GridRegion; 36using GridRegion = OpenSim.Services.Interfaces.GridRegion;
38
39using OpenMetaverse; 37using OpenMetaverse;
40using OpenMetaverse.Imaging; 38using OpenMetaverse.Imaging;
41using OpenMetaverse.StructuredData; 39using OpenMetaverse.StructuredData;
@@ -50,7 +48,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
50 { 48 {
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 50
53 private static UUID m_HGMapImage = new UUID("00000000-0000-1111-9999-000000000013"); 51// private static UUID m_HGMapImage = new UUID("00000000-0000-1111-9999-000000000013");
54 52
55 private IAssetService m_AssetService; 53 private IAssetService m_AssetService;
56 54
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index c1e5949..4501937 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -32,12 +32,10 @@ using System.IO;
32using System.Net; 32using System.Net;
33using System.Reflection; 33using System.Reflection;
34using System.Text; 34using System.Text;
35
36using OpenSim.Framework; 35using OpenSim.Framework;
37using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
38using OpenSim.Services.Connectors.Simulation; 37using OpenSim.Services.Connectors.Simulation;
39using GridRegion = OpenSim.Services.Interfaces.GridRegion; 38using GridRegion = OpenSim.Services.Interfaces.GridRegion;
40
41using OpenMetaverse; 39using OpenMetaverse;
42using OpenMetaverse.StructuredData; 40using OpenMetaverse.StructuredData;
43using log4net; 41using log4net;
@@ -243,7 +241,7 @@ namespace OpenSim.Services.Connectors.Hypergrid
243 { 241 {
244 response = request.Send(m_ServerURL, 10000); 242 response = request.Send(m_ServerURL, 10000);
245 } 243 }
246 catch (Exception e) 244 catch (Exception)
247 { 245 {
248 return null; 246 return null;
249 } 247 }
@@ -308,13 +306,12 @@ namespace OpenSim.Services.Connectors.Hypergrid
308 } 306 }
309 307
310 } 308 }
311 catch (Exception e) 309 catch (Exception)
312 { 310 {
313 return null; 311 return null;
314 } 312 }
315 313
316 return null; 314 return null;
317
318 } 315 }
319 316
320 public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName) 317 public bool AgentIsComingHome(UUID sessionID, string thisGridExternalName)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index a47f32c..734bdd2 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -53,7 +53,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
53 private static readonly ILog m_log = 53 private static readonly ILog m_log =
54 LogManager.GetLogger( 54 LogManager.GetLogger(
55 MethodBase.GetCurrentMethod().DeclaringType); 55 MethodBase.GetCurrentMethod().DeclaringType);
56 private static string ZeroID = UUID.Zero.ToString(); 56// private static string ZeroID = UUID.Zero.ToString();
57 57
58 private string m_serverUrl = String.Empty; 58 private string m_serverUrl = String.Empty;
59 59
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index 2b6d29c..89c1a5a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
69 69
70 private string m_serverUrl = String.Empty; 70 private string m_serverUrl = String.Empty;
71 private string m_userServerUrl = String.Empty; 71 private string m_userServerUrl = String.Empty;
72 private object m_gestureSyncRoot = new object(); 72// private object m_gestureSyncRoot = new object();
73 73
74 #region ISharedRegionModule 74 #region ISharedRegionModule
75 75
@@ -687,12 +687,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
687 for (int i = 0; i < items.Count; i++) 687 for (int i = 0; i < items.Count; i++)
688 itemIDs[i] = items[i].AsUUID().ToString(); 688 itemIDs[i] = items[i].AsUUID().ToString();
689 689
690 NameValueCollection requestArgs = new NameValueCollection 690// NameValueCollection requestArgs = new NameValueCollection
691 { 691// {
692 { "RequestMethod", "GetInventoryNodes" }, 692// { "RequestMethod", "GetInventoryNodes" },
693 { "OwnerID", userID.ToString() }, 693// { "OwnerID", userID.ToString() },
694 { "Items", String.Join(",", itemIDs) } 694// { "Items", String.Join(",", itemIDs) }
695 }; 695// };
696 696
697 // FIXME: Implement this in SimianGrid 697 // FIXME: Implement this in SimianGrid
698 return new List<InventoryItemBase>(0); 698 return new List<InventoryItemBase>(0);
@@ -708,12 +708,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
708 /// the user's inventory</returns> 708 /// the user's inventory</returns>
709 public int GetAssetPermissions(UUID userID, UUID assetID) 709 public int GetAssetPermissions(UUID userID, UUID assetID)
710 { 710 {
711 NameValueCollection requestArgs = new NameValueCollection 711// NameValueCollection requestArgs = new NameValueCollection
712 { 712// {
713 { "RequestMethod", "GetInventoryNodes" }, 713// { "RequestMethod", "GetInventoryNodes" },
714 { "OwnerID", userID.ToString() }, 714// { "OwnerID", userID.ToString() },
715 { "AssetID", assetID.ToString() } 715// { "AssetID", assetID.ToString() }
716 }; 716// };
717 717
718 // FIXME: Implement this in SimianGrid 718 // FIXME: Implement this in SimianGrid
719 return (int)PermissionMask.All; 719 return (int)PermissionMask.All;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 6f17931..ca23e27 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -349,24 +349,24 @@ namespace OpenSim.Services.Connectors.SimianGrid
349 return null; 349 return null;
350 } 350 }
351 351
352 private OSDMap GetSessionData(UUID sessionID) 352// private OSDMap GetSessionData(UUID sessionID)
353 { 353// {
354 m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for session " + sessionID); 354// m_log.DebugFormat("[SIMIAN PRESENCE CONNECTOR]: Requesting session data for session " + sessionID);
355 355//
356 NameValueCollection requestArgs = new NameValueCollection 356// NameValueCollection requestArgs = new NameValueCollection
357 { 357// {
358 { "RequestMethod", "GetSession" }, 358// { "RequestMethod", "GetSession" },
359 { "SessionID", sessionID.ToString() } 359// { "SessionID", sessionID.ToString() }
360 }; 360// };
361 361//
362 OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); 362// OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
363 if (response["Success"].AsBoolean()) 363// if (response["Success"].AsBoolean())
364 return response; 364// return response;
365 else 365// else
366 m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID); 366// m_log.Warn("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve session data for session " + sessionID);
367 367//
368 return null; 368// return null;
369 } 369// }
370 370
371 private List<PresenceInfo> GetSessions(UUID userID) 371 private List<PresenceInfo> GetSessions(UUID userID)
372 { 372 {
diff --git a/OpenSim/Services/InventoryService/XInventoryService.cs b/OpenSim/Services/InventoryService/XInventoryService.cs
index f63ab16..90a5c22 100644
--- a/OpenSim/Services/InventoryService/XInventoryService.cs
+++ b/OpenSim/Services/InventoryService/XInventoryService.cs
@@ -157,6 +157,8 @@ namespace OpenSim.Services.InventoryService
157 157
158 protected virtual XInventoryFolder[] GetSystemFolders(UUID principalID) 158 protected virtual XInventoryFolder[] GetSystemFolders(UUID principalID)
159 { 159 {
160// m_log.DebugFormat("[XINVENTORY SERVICE]: Getting system folders for {0}", principalID);
161
160 XInventoryFolder[] allFolders = m_Database.GetFolders( 162 XInventoryFolder[] allFolders = m_Database.GetFolders(
161 new string[] { "agentID" }, 163 new string[] { "agentID" },
162 new string[] { principalID.ToString() }); 164 new string[] { principalID.ToString() });
@@ -170,6 +172,9 @@ namespace OpenSim.Services.InventoryService
170 return false; 172 return false;
171 }); 173 });
172 174
175// m_log.DebugFormat(
176// "[XINVENTORY SERVICE]: Found {0} system folders for {1}", sysFolders.Length, principalID);
177
173 return sysFolders; 178 return sysFolders;
174 } 179 }
175 180
@@ -186,7 +191,7 @@ namespace OpenSim.Services.InventoryService
186 191
187 foreach (XInventoryFolder x in allFolders) 192 foreach (XInventoryFolder x in allFolders)
188 { 193 {
189 //m_log.DebugFormat("[XINVENTORY]: Adding folder {0} to skeleton", x.folderName); 194 //m_log.DebugFormat("[XINVENTORY SERVICE]: Adding folder {0} to skeleton", x.folderName);
190 folders.Add(ConvertToOpenSim(x)); 195 folders.Add(ConvertToOpenSim(x));
191 } 196 }
192 197