aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-13 23:38:51 +0000
committerJustin Clarke Casey2008-04-13 23:38:51 +0000
commiteacba916ec0022b35979403d285b1a4e991ed1f7 (patch)
tree35d74f62f3dba9c5b007be2740093ca8731c7fe4
parent* Fix a bug in the friends module that causes a friend not to appear online w... (diff)
downloadopensim-SC_OLD-eacba916ec0022b35979403d285b1a4e991ed1f7.zip
opensim-SC_OLD-eacba916ec0022b35979403d285b1a4e991ed1f7.tar.gz
opensim-SC_OLD-eacba916ec0022b35979403d285b1a4e991ed1f7.tar.bz2
opensim-SC_OLD-eacba916ec0022b35979403d285b1a4e991ed1f7.tar.xz
* Reverse mantis #912 since it was causing inventory to disappear from the root folder on 1.19.1.4 non-cache clear relog.
* The folder version numbers probably do need to be non-zero, but there is a further subtlety of the protocol to understand first
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index d859227..050657d 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -272,7 +272,16 @@ namespace OpenSim.Region.Capabilities
272 contents.agent___id = m_agentID; 272 contents.agent___id = m_agentID;
273 contents.owner___id = invFetch.owner_id; 273 contents.owner___id = invFetch.owner_id;
274 contents.folder___id = invFetch.folder_id; 274 contents.folder___id = invFetch.folder_id;
275 contents.version = 1; //FixMe 275
276 // In http://opensimulator.org/mantis/view.php?id=912 we tried changing this to 1 instead.
277 // Unfortunately, on 1.19.1.4, this means that we see a problem where on subsequent logins
278 // without clearing client cache, objects in the root folder disappear until the cache is cleared,
279 // at which point they reappear.
280 //
281 // Seeing the version to something other than 0 may be the right thing to do, but there is
282 // a greater subtlety of the second life protocol that needs to be understood first.
283 contents.version = 0;
284
276 contents.descendents = 0; 285 contents.descendents = 0;
277 reply.folders.Array.Add(contents); 286 reply.folders.Array.Add(contents);
278 List<InventoryItemBase> itemList = null; 287 List<InventoryItemBase> itemList = null;