aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-04-15 23:10:12 +0000
committerTeravus Ovares2008-04-15 23:10:12 +0000
commite777f88028322c9a7042ba20669b00fd9fbd573c (patch)
tree47203f1ac640808b2523a5560485ee0ba63ed0f5 /OpenSim/Framework
parentfix types on nhibernate mappings for User bits (diff)
downloadopensim-SC_OLD-e777f88028322c9a7042ba20669b00fd9fbd573c.zip
opensim-SC_OLD-e777f88028322c9a7042ba20669b00fd9fbd573c.tar.gz
opensim-SC_OLD-e777f88028322c9a7042ba20669b00fd9fbd573c.tar.bz2
opensim-SC_OLD-e777f88028322c9a7042ba20669b00fd9fbd573c.tar.xz
* A tweak of the caps system so that new caps have random paths instead of a fixed path
* This allows caps requests to be routed to regions where the agent is currently a root agent instead of the region that they logged into as it did previously. * This fixes a wide variety of bugs related to 'can't do X once i've crossed a border'. * The first seed cap request fails, the second one works. (this generates an error message on the console) * Experimental.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs13
-rw-r--r--OpenSim/Framework/IScene.cs3
2 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
index ec5717e..9f202ff 100644
--- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
+++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs
@@ -251,6 +251,11 @@ namespace OpenSim.Framework.Communications.Cache
251 ItemReceive(userID, itemInfo); 251 ItemReceive(userID, itemInfo);
252 m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo); 252 m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
253 } 253 }
254 else
255 {
256 m_log.Error("[UNABLE TO UPLOAD]: ");
257 }
258
254 } 259 }
255 260
256 /// <summary> 261 /// <summary>
@@ -264,6 +269,10 @@ namespace OpenSim.Framework.Communications.Cache
264 { 269 {
265 m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo); 270 m_commsManager.InventoryService.AddNewInventoryItem(userID, itemInfo);
266 } 271 }
272 else
273 {
274 m_log.Error("[UNABLE TO UPDATE]: ");
275 }
267 } 276 }
268 277
269 /// <summary> 278 /// <summary>
@@ -283,6 +292,10 @@ namespace OpenSim.Framework.Communications.Cache
283 m_commsManager.InventoryService.DeleteInventoryItem(userID, item); 292 m_commsManager.InventoryService.DeleteInventoryItem(userID, item);
284 } 293 }
285 } 294 }
295 else
296 {
297 m_log.Error("[UNABLE TO DELETE]: ");
298 }
286 299
287 return result; 300 return result;
288 } 301 }
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index cdf6257..ad3bd91 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Framework
64 64
65 ClientManager ClientManager { get; } 65 ClientManager ClientManager { get; }
66 66
67 string GetCapsPath(LLUUID agentId); 67 string GetCapsPath(LLUUID agentId);
68 string GetNewCapsPath(LLUUID agentId);
68 } 69 }
69} 70}