diff options
| author | Diva Canto | 2011-01-17 17:41:06 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-01-17 17:41:06 -0800 |
| commit | a07375a7ae187b57371a508300ffcacbabf5a4df (patch) | |
| tree | 3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Region/Framework | |
| parent | Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff) | |
| parent | force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff) | |
| download | opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.zip opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2 opensim-SC-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
2 files changed, 5 insertions, 5 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 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index f811f3e..fa2c7b5 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -1104,7 +1104,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1104 | /// </summary> | 1104 | /// </summary> |
| 1105 | public void CompleteMovement(IClientAPI client) | 1105 | public void CompleteMovement(IClientAPI client) |
| 1106 | { | 1106 | { |
| 1107 | DateTime startTime = DateTime.Now; | 1107 | // DateTime startTime = DateTime.Now; |
| 1108 | 1108 | ||
| 1109 | m_log.DebugFormat( | 1109 | m_log.DebugFormat( |
| 1110 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", | 1110 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", |
| @@ -1157,9 +1157,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1157 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); | 1157 | friendsModule.SendFriendsOnlineIfNeeded(ControllingClient); |
| 1158 | } | 1158 | } |
| 1159 | 1159 | ||
| 1160 | m_log.DebugFormat( | 1160 | // m_log.DebugFormat( |
| 1161 | "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", | 1161 | // "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", |
| 1162 | client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); | 1162 | // client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); |
| 1163 | } | 1163 | } |
| 1164 | 1164 | ||
| 1165 | /// <summary> | 1165 | /// <summary> |