aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorDiva Canto2011-01-17 17:41:06 -0800
committerDiva Canto2011-01-17 17:41:06 -0800
commita07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentRemoved the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parentforce objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
downloadopensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 004e20c..cff2cf4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -849,7 +849,7 @@ namespace OpenSim.Region.Framework.Scenes
849 /// <param name="xferManager"></param> 849 /// <param name="xferManager"></param>
850 public void RequestInventoryFile(IClientAPI client, IXfer xferManager) 850 public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
851 { 851 {
852 bool changed = CreateInventoryFile(); 852 CreateInventoryFile();
853 853
854 if (m_inventorySerial == 0) // No inventory 854 if (m_inventorySerial == 0) // No inventory
855 { 855 {