diff options
Diffstat (limited to '')
27 files changed, 124 insertions, 124 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs index 7ac1e7e..5b571c7 100644 --- a/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs +++ b/OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs | |||
@@ -34,7 +34,7 @@ using OpenMetaverse; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | 35 | ||
36 | namespace OpenSim.Region.Framework.Scenes | 36 | namespace OpenSim.Region.Framework.Scenes |
37 | { | 37 | { |
38 | class DeleteToInventoryHolder | 38 | class DeleteToInventoryHolder |
39 | { | 39 | { |
40 | public DeRezAction action; | 40 | public DeRezAction action; |
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
49 | /// up the main client thread. | 49 | /// up the main client thread. |
50 | /// </summary> | 50 | /// </summary> |
51 | public class AsyncSceneObjectGroupDeleter | 51 | public class AsyncSceneObjectGroupDeleter |
52 | { | 52 | { |
53 | private static readonly ILog m_log | 53 | private static readonly ILog m_log |
54 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
@@ -58,16 +58,16 @@ namespace OpenSim.Region.Framework.Scenes | |||
58 | /// </value> | 58 | /// </value> |
59 | public bool Enabled; | 59 | public bool Enabled; |
60 | 60 | ||
61 | private Timer m_inventoryTicker = new Timer(2000); | 61 | private Timer m_inventoryTicker = new Timer(2000); |
62 | private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>(); | 62 | private readonly Queue<DeleteToInventoryHolder> m_inventoryDeletes = new Queue<DeleteToInventoryHolder>(); |
63 | private Scene m_scene; | 63 | private Scene m_scene; |
64 | 64 | ||
65 | public AsyncSceneObjectGroupDeleter(Scene scene) | 65 | public AsyncSceneObjectGroupDeleter(Scene scene) |
66 | { | 66 | { |
67 | m_scene = scene; | 67 | m_scene = scene; |
68 | 68 | ||
69 | m_inventoryTicker.AutoReset = false; | 69 | m_inventoryTicker.AutoReset = false; |
70 | m_inventoryTicker.Elapsed += InventoryRunDeleteTimer; | 70 | m_inventoryTicker.Elapsed += InventoryRunDeleteTimer; |
71 | } | 71 | } |
72 | 72 | ||
73 | /// <summary> | 73 | /// <summary> |
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
113 | { | 113 | { |
114 | //m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing..."); | 114 | //m_log.Debug("[SCENE]: Sent item successfully to inventory, continuing..."); |
115 | } | 115 | } |
116 | } | 116 | } |
117 | 117 | ||
118 | /// <summary> | 118 | /// <summary> |
119 | /// Move the next object in the queue to inventory. Then delete it properly from the scene. | 119 | /// Move the next object in the queue to inventory. Then delete it properly from the scene. |
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
121 | /// <returns></returns> | 121 | /// <returns></returns> |
122 | public bool InventoryDeQueueAndDelete() | 122 | public bool InventoryDeQueueAndDelete() |
123 | { | 123 | { |
124 | DeleteToInventoryHolder x = null; | 124 | DeleteToInventoryHolder x = null; |
125 | 125 | ||
126 | try | 126 | try |
127 | { | 127 | { |
@@ -142,9 +142,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
142 | 142 | ||
143 | try | 143 | try |
144 | { | 144 | { |
145 | m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient); | 145 | m_scene.DeleteToInventory(x.action, x.folderID, x.objectGroup, x.remoteClient); |
146 | if (x.permissionToDelete) | 146 | if (x.permissionToDelete) |
147 | m_scene.DeleteSceneObject(x.objectGroup, false); | 147 | m_scene.DeleteSceneObject(x.objectGroup, false); |
148 | } | 148 | } |
149 | catch (Exception e) | 149 | catch (Exception e) |
150 | { | 150 | { |
@@ -166,6 +166,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
166 | 166 | ||
167 | m_log.Debug("[SCENE]: No objects left in inventory send queue."); | 167 | m_log.Debug("[SCENE]: No objects left in inventory send queue."); |
168 | return false; | 168 | return false; |
169 | } | 169 | } |
170 | } | 170 | } |
171 | } | 171 | } |
diff --git a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs index 06b1d22..72d599a 100644 --- a/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs +++ b/OpenSim/Region/Framework/Scenes/AvatarAnimations.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
47 | { | 47 | { |
48 | if (nod.Attributes["name"] != null) | 48 | if (nod.Attributes["name"] != null) |
49 | { | 49 | { |
50 | string name = (string)nod.Attributes["name"].Value; | 50 | string name = (string)nod.Attributes["name"].Value; |
51 | UUID id = (UUID)nod.InnerText; | 51 | UUID id = (UUID)nod.InnerText; |
52 | string animState = (string)nod.Attributes["state"].Value; | 52 | string animState = (string)nod.Attributes["state"].Value; |
53 | 53 | ||
diff --git a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs index 1dd9613..5f2eb0d 100644 --- a/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs +++ b/OpenSim/Region/Framework/Scenes/BinBVHAnimation.cs | |||
@@ -234,7 +234,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
234 | 234 | ||
235 | 235 | ||
236 | /// <summary> | 236 | /// <summary> |
237 | /// Variable length strings seem to be null terminated in the animation asset.. but.. | 237 | /// Variable length strings seem to be null terminated in the animation asset.. but.. |
238 | /// use with caution, home grown. | 238 | /// use with caution, home grown. |
239 | /// advances the index. | 239 | /// advances the index. |
240 | /// </summary> | 240 | /// </summary> |
@@ -273,7 +273,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
273 | byte[] interm = new byte[endpos-i]; | 273 | byte[] interm = new byte[endpos-i]; |
274 | for (; i<endpos; i++) | 274 | for (; i<endpos; i++) |
275 | { | 275 | { |
276 | interm[i-startpos] = data[i]; | 276 | interm[i-startpos] = data[i]; |
277 | } | 277 | } |
278 | i++; // advance past the null character | 278 | i++; // advance past the null character |
279 | 279 | ||
@@ -624,7 +624,7 @@ switch (jointname) | |||
624 | case "mWristLeft": | 624 | case "mWristLeft": |
625 | case "mWristRight": | 625 | case "mWristRight": |
626 | case "mShoulderLeft": | 626 | case "mShoulderLeft": |
627 | case "mShoulderRight": | 627 | case "mShoulderRight": |
628 | // ZYX->ZXY | 628 | // ZYX->ZXY |
629 | t = y; | 629 | t = y; |
630 | y = z; | 630 | y = z; |
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs index 504b90a..0ceef39 100644 --- a/OpenSim/Region/Framework/Scenes/EntityManager.cs +++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs | |||
@@ -144,7 +144,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
144 | { | 144 | { |
145 | m_log.ErrorFormat("Remove Entity failed for {0}", localID, e); | 145 | m_log.ErrorFormat("Remove Entity failed for {0}", localID, e); |
146 | return false; | 146 | return false; |
147 | } | 147 | } |
148 | } | 148 | } |
149 | } | 149 | } |
150 | 150 | ||
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 7424b24..753344d 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -290,7 +290,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
290 | /// Guid.Empty is returned. | 290 | /// Guid.Empty is returned. |
291 | /// </summary> | 291 | /// </summary> |
292 | public delegate void OarFileSaved(Guid guid, string message); | 292 | public delegate void OarFileSaved(Guid guid, string message); |
293 | public event OarFileSaved OnOarFileSaved; | 293 | public event OarFileSaved OnOarFileSaved; |
294 | 294 | ||
295 | /// <summary> | 295 | /// <summary> |
296 | /// Called when the script compile queue becomes empty | 296 | /// Called when the script compile queue becomes empty |
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1004 | handlerOarFileSaved = OnOarFileSaved; | 1004 | handlerOarFileSaved = OnOarFileSaved; |
1005 | if (handlerOarFileSaved != null) | 1005 | if (handlerOarFileSaved != null) |
1006 | handlerOarFileSaved(requestId, message); | 1006 | handlerOarFileSaved(requestId, message); |
1007 | } | 1007 | } |
1008 | 1008 | ||
1009 | public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) | 1009 | public void TriggerEmptyScriptCompileQueue(int numScriptsFailed, string message) |
1010 | { | 1010 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index 1217f9b..d7e62a8 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
@@ -357,7 +357,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
357 | m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); | 357 | m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); |
358 | m_log.DebugFormat( | 358 | m_log.DebugFormat( |
359 | "[HGSceneCommService]: User {0} is going to another region, profile cache removed", | 359 | "[HGSceneCommService]: User {0} is going to another region, profile cache removed", |
360 | avatar.UUID); | 360 | avatar.UUID); |
361 | } | 361 | } |
362 | } | 362 | } |
363 | else | 363 | else |
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index 7c02f9a..73f918e 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
53 | 53 | ||
54 | 54 | ||
55 | public class RegionStatsHandler : IStreamedRequestHandler | 55 | public class RegionStatsHandler : IStreamedRequestHandler |
56 | { | 56 | { |
57 | private string osRXStatsURI = String.Empty; | 57 | private string osRXStatsURI = String.Empty; |
58 | private string osXStatsURI = String.Empty; | 58 | private string osXStatsURI = String.Empty; |
59 | //private string osSecret = String.Empty; | 59 | //private string osSecret = String.Empty; |
@@ -87,13 +87,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
87 | } | 87 | } |
88 | 88 | ||
89 | public string Path | 89 | public string Path |
90 | { | 90 | { |
91 | // This is for the region and is the regionSecret hashed | 91 | // This is for the region and is the regionSecret hashed |
92 | get { return "/" + osRXStatsURI + "/"; } | 92 | get { return "/" + osRXStatsURI + "/"; } |
93 | } | 93 | } |
94 | 94 | ||
95 | private string Report() | 95 | private string Report() |
96 | { | 96 | { |
97 | OSDMap args = new OSDMap(30); | 97 | OSDMap args = new OSDMap(30); |
98 | //int time = Util.ToUnixTime(DateTime.Now); | 98 | //int time = Util.ToUnixTime(DateTime.Now); |
99 | args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); | 99 | args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/"); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index eb397f6..a4460e4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1015 | return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId); | 1015 | return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId); |
1016 | } | 1016 | } |
1017 | else | 1017 | else |
1018 | { | 1018 | { |
1019 | InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId); | 1019 | InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId); |
1020 | 1020 | ||
1021 | if (agentItem == null) | 1021 | if (agentItem == null) |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index fddba86..6c9856d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -413,7 +413,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
413 | remoteClient.SendInventoryItemDetails(ownerID, item); | 413 | remoteClient.SendInventoryItemDetails(ownerID, item); |
414 | } | 414 | } |
415 | // else shouldn't we send an alert message? | 415 | // else shouldn't we send an alert message? |
416 | } | 416 | } |
417 | 417 | ||
418 | /// <summary> | 418 | /// <summary> |
419 | /// Tell the client about the various child items and folders contained in the requested folder. | 419 | /// Tell the client about the various child items and folders contained in the requested folder. |
@@ -485,7 +485,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
485 | 485 | ||
486 | // TODO: This code for looking in the folder for the library should be folded back into the | 486 | // TODO: This code for looking in the folder for the library should be folded back into the |
487 | // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc. | 487 | // CachedUserInfo so that this class doesn't have to know the details (and so that multiple libraries, etc. |
488 | // can be handled transparently). | 488 | // can be handled transparently). |
489 | InventoryFolderImpl fold; | 489 | InventoryFolderImpl fold; |
490 | if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null) | 490 | if ((fold = CommsManager.UserProfileCacheService.LibraryRoot.FindFolder(folderID)) != null) |
491 | { | 491 | { |
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
515 | 515 | ||
516 | return contents; | 516 | return contents; |
517 | 517 | ||
518 | } | 518 | } |
519 | 519 | ||
520 | /// <summary> | 520 | /// <summary> |
521 | /// Handle an inventory folder creation request from the client. | 521 | /// Handle an inventory folder creation request from the client. |
@@ -535,7 +535,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
535 | "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}", | 535 | "[AGENT INVENTORY]: Failed to move create folder for user {0} {1}", |
536 | remoteClient.Name, remoteClient.AgentId); | 536 | remoteClient.Name, remoteClient.AgentId); |
537 | } | 537 | } |
538 | } | 538 | } |
539 | 539 | ||
540 | /// <summary> | 540 | /// <summary> |
541 | /// Handle a client request to update the inventory folder | 541 | /// Handle a client request to update the inventory folder |
@@ -570,7 +570,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
570 | remoteClient.Name, remoteClient.AgentId); | 570 | remoteClient.Name, remoteClient.AgentId); |
571 | } | 571 | } |
572 | } | 572 | } |
573 | } | 573 | } |
574 | 574 | ||
575 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) | 575 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) |
576 | { | 576 | { |
@@ -588,7 +588,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
588 | { | 588 | { |
589 | m_log.WarnFormat("[AGENT INVENTORY]: request to move folder {0} but folder not found", folderID); | 589 | m_log.WarnFormat("[AGENT INVENTORY]: request to move folder {0} but folder not found", folderID); |
590 | } | 590 | } |
591 | } | 591 | } |
592 | 592 | ||
593 | /// <summary> | 593 | /// <summary> |
594 | /// This should delete all the items and folders in the given directory. | 594 | /// This should delete all the items and folders in the given directory. |
@@ -609,7 +609,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
609 | { | 609 | { |
610 | m_log.WarnFormat("[AGENT INVENTORY]: Exception on purge folder for user {0}: {1}", remoteClient.AgentId, e.Message); | 610 | m_log.WarnFormat("[AGENT INVENTORY]: Exception on purge folder for user {0}: {1}", remoteClient.AgentId, e.Message); |
611 | } | 611 | } |
612 | } | 612 | } |
613 | 613 | ||
614 | 614 | ||
615 | private void PurgeFolderAsync(UUID userID, UUID folderID) | 615 | private void PurgeFolderAsync(UUID userID, UUID folderID) |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index 226ec15..d01cef7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | |||
@@ -805,7 +805,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
805 | /// <param name="invType"></param> | 805 | /// <param name="invType"></param> |
806 | /// <param name="objectID"></param> | 806 | /// <param name="objectID"></param> |
807 | /// <param name="userID"></param> | 807 | /// <param name="userID"></param> |
808 | /// <returns></returns> | 808 | /// <returns></returns> |
809 | public bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID) | 809 | public bool CanCreateObjectInventory(int invType, UUID objectID, UUID userID) |
810 | { | 810 | { |
811 | CreateObjectInventoryHandler handler = OnCreateObjectInventory; | 811 | CreateObjectInventoryHandler handler = OnCreateObjectInventory; |
@@ -856,7 +856,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
856 | /// </summary> | 856 | /// </summary> |
857 | /// <param name="invType"></param> | 857 | /// <param name="invType"></param> |
858 | /// <param name="userID"></param> | 858 | /// <param name="userID"></param> |
859 | /// <returns></returns> | 859 | /// <returns></returns> |
860 | public bool CanCreateUserInventory(int invType, UUID userID) | 860 | public bool CanCreateUserInventory(int invType, UUID userID) |
861 | { | 861 | { |
862 | CreateUserInventoryHandler handler = OnCreateUserInventory; | 862 | CreateUserInventoryHandler handler = OnCreateUserInventory; |
@@ -877,7 +877,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
877 | /// </summary> | 877 | /// </summary> |
878 | /// <param name="itemID"></param> | 878 | /// <param name="itemID"></param> |
879 | /// <param name="userID"></param> | 879 | /// <param name="userID"></param> |
880 | /// <returns></returns> | 880 | /// <returns></returns> |
881 | public bool CanEditUserInventory(UUID itemID, UUID userID) | 881 | public bool CanEditUserInventory(UUID itemID, UUID userID) |
882 | { | 882 | { |
883 | EditUserInventoryHandler handler = OnEditUserInventory; | 883 | EditUserInventoryHandler handler = OnEditUserInventory; |
@@ -891,14 +891,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
891 | } | 891 | } |
892 | } | 892 | } |
893 | return true; | 893 | return true; |
894 | } | 894 | } |
895 | 895 | ||
896 | /// <summary> | 896 | /// <summary> |
897 | /// Check whether the specified user is allowed to copy the given inventory item from their own inventory. | 897 | /// Check whether the specified user is allowed to copy the given inventory item from their own inventory. |
898 | /// </summary> | 898 | /// </summary> |
899 | /// <param name="itemID"></param> | 899 | /// <param name="itemID"></param> |
900 | /// <param name="userID"></param> | 900 | /// <param name="userID"></param> |
901 | /// <returns></returns> | 901 | /// <returns></returns> |
902 | public bool CanCopyUserInventory(UUID itemID, UUID userID) | 902 | public bool CanCopyUserInventory(UUID itemID, UUID userID) |
903 | { | 903 | { |
904 | CopyUserInventoryHandler handler = OnCopyUserInventory; | 904 | CopyUserInventoryHandler handler = OnCopyUserInventory; |
@@ -912,14 +912,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
912 | } | 912 | } |
913 | } | 913 | } |
914 | return true; | 914 | return true; |
915 | } | 915 | } |
916 | 916 | ||
917 | /// <summary> | 917 | /// <summary> |
918 | /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. | 918 | /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. |
919 | /// </summary> | 919 | /// </summary> |
920 | /// <param name="itemID"></param> | 920 | /// <param name="itemID"></param> |
921 | /// <param name="userID"></param> | 921 | /// <param name="userID"></param> |
922 | /// <returns></returns> | 922 | /// <returns></returns> |
923 | public bool CanDeleteUserInventory(UUID itemID, UUID userID) | 923 | public bool CanDeleteUserInventory(UUID itemID, UUID userID) |
924 | { | 924 | { |
925 | DeleteUserInventoryHandler handler = OnDeleteUserInventory; | 925 | DeleteUserInventoryHandler handler = OnDeleteUserInventory; |
@@ -933,7 +933,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
933 | } | 933 | } |
934 | } | 934 | } |
935 | return true; | 935 | return true; |
936 | } | 936 | } |
937 | 937 | ||
938 | public bool CanTeleport(UUID userID) | 938 | public bool CanTeleport(UUID userID) |
939 | { | 939 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 39f3007..f8db354 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -996,7 +996,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
996 | 996 | ||
997 | // Loop it | 997 | // Loop it |
998 | if (m_frame == Int32.MaxValue) | 998 | if (m_frame == Int32.MaxValue) |
999 | m_frame = 0; | 999 | m_frame = 0; |
1000 | 1000 | ||
1001 | otherMS = Environment.TickCount; | 1001 | otherMS = Environment.TickCount; |
1002 | // run through all entities looking for updates (slow) | 1002 | // run through all entities looking for updates (slow) |
@@ -2023,12 +2023,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2023 | return true; | 2023 | return true; |
2024 | } | 2024 | } |
2025 | break; | 2025 | break; |
2026 | case Cardinals.W: | 2026 | case Cardinals.W: |
2027 | foreach (Border b in WestBorders) | 2027 | foreach (Border b in WestBorders) |
2028 | { | 2028 | { |
2029 | if (b.TestCross(position)) | 2029 | if (b.TestCross(position)) |
2030 | return true; | 2030 | return true; |
2031 | } | 2031 | } |
2032 | break; | 2032 | break; |
2033 | } | 2033 | } |
2034 | } | 2034 | } |
@@ -3270,7 +3270,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3270 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", | 3270 | m_log.WarnFormat("[CONNECTION BEGIN]: Denied access to: {0} ({1} {2}) at {3} because the user does not have access to the region", |
3271 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); | 3271 | agent.AgentID, agent.firstname, agent.lastname, RegionInfo.RegionName); |
3272 | //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName); | 3272 | //reason = String.Format("You are not currently on the access list for {0}",RegionInfo.RegionName); |
3273 | return false; | 3273 | return false; |
3274 | } | 3274 | } |
3275 | } | 3275 | } |
3276 | 3276 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 2af98cc..0ac4ed4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
92 | /// <value> | 92 | /// <value> |
93 | /// Registered classes that are capable of creating entities. | 93 | /// Registered classes that are capable of creating entities. |
94 | /// </value> | 94 | /// </value> |
95 | protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>(); | 95 | protected Dictionary<PCode, IEntityCreator> m_entityCreators = new Dictionary<PCode, IEntityCreator>(); |
96 | 96 | ||
97 | /// <summary> | 97 | /// <summary> |
98 | /// The last allocated local prim id. When a new local id is requested, the next number in the sequence is | 98 | /// The last allocated local prim id. When a new local id is requested, the next number in the sequence is |
@@ -279,7 +279,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
279 | _primAllocateMutex.ReleaseMutex(); | 279 | _primAllocateMutex.ReleaseMutex(); |
280 | 280 | ||
281 | return myID; | 281 | return myID; |
282 | } | 282 | } |
283 | 283 | ||
284 | #region Module Methods | 284 | #region Module Methods |
285 | 285 | ||
@@ -473,7 +473,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
473 | /// <summary> | 473 | /// <summary> |
474 | /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. | 474 | /// Shows various details about the sim based on the parameters supplied by the console command in openSimMain. |
475 | /// </summary> | 475 | /// </summary> |
476 | /// <param name="showParams">What to show</param> | 476 | /// <param name="showParams">What to show</param> |
477 | public virtual void Show(string[] showParams) | 477 | public virtual void Show(string[] showParams) |
478 | { | 478 | { |
479 | switch (showParams[0]) | 479 | switch (showParams[0]) |
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
489 | } | 489 | } |
490 | break; | 490 | break; |
491 | } | 491 | } |
492 | } | 492 | } |
493 | 493 | ||
494 | public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback) | 494 | public void AddCommand(object mod, string command, string shorthelp, string longhelp, CommandDelegate callback) |
495 | { | 495 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 0c471aa..54ac792 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -845,7 +845,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
845 | ScenePresence sp; | 845 | ScenePresence sp; |
846 | 846 | ||
847 | lock (ScenePresences) | 847 | lock (ScenePresences) |
848 | { | 848 | { |
849 | ScenePresences.TryGetValue(agentID, out sp); | 849 | ScenePresences.TryGetValue(agentID, out sp); |
850 | } | 850 | } |
851 | 851 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs index 0019b23..1d4efd0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneManager.cs +++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs | |||
@@ -192,7 +192,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
192 | public void SaveCurrentSceneToXml(string filename) | 192 | public void SaveCurrentSceneToXml(string filename) |
193 | { | 193 | { |
194 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); | 194 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); |
195 | if (serialiser != null) | 195 | if (serialiser != null) |
196 | serialiser.SavePrimsToXml(CurrentOrFirstScene, filename); | 196 | serialiser.SavePrimsToXml(CurrentOrFirstScene, filename); |
197 | } | 197 | } |
198 | 198 | ||
@@ -205,7 +205,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
205 | public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset) | 205 | public void LoadCurrentSceneFromXml(string filename, bool generateNewIDs, Vector3 loadOffset) |
206 | { | 206 | { |
207 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); | 207 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); |
208 | if (serialiser != null) | 208 | if (serialiser != null) |
209 | serialiser.LoadPrimsFromXml(CurrentOrFirstScene, filename, generateNewIDs, loadOffset); | 209 | serialiser.LoadPrimsFromXml(CurrentOrFirstScene, filename, generateNewIDs, loadOffset); |
210 | } | 210 | } |
211 | 211 | ||
@@ -216,14 +216,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
216 | public void SaveCurrentSceneToXml2(string filename) | 216 | public void SaveCurrentSceneToXml2(string filename) |
217 | { | 217 | { |
218 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); | 218 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); |
219 | if (serialiser != null) | 219 | if (serialiser != null) |
220 | serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename); | 220 | serialiser.SavePrimsToXml2(CurrentOrFirstScene, filename); |
221 | } | 221 | } |
222 | 222 | ||
223 | public void SaveNamedPrimsToXml2(string primName, string filename) | 223 | public void SaveNamedPrimsToXml2(string primName, string filename) |
224 | { | 224 | { |
225 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); | 225 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); |
226 | if (serialiser != null) | 226 | if (serialiser != null) |
227 | serialiser.SaveNamedPrimsToXml2(CurrentOrFirstScene, primName, filename); | 227 | serialiser.SaveNamedPrimsToXml2(CurrentOrFirstScene, primName, filename); |
228 | } | 228 | } |
229 | 229 | ||
@@ -233,7 +233,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
233 | public void LoadCurrentSceneFromXml2(string filename) | 233 | public void LoadCurrentSceneFromXml2(string filename) |
234 | { | 234 | { |
235 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); | 235 | IRegionSerialiserModule serialiser = CurrentOrFirstScene.RequestModuleInterface<IRegionSerialiserModule>(); |
236 | if (serialiser != null) | 236 | if (serialiser != null) |
237 | serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename); | 237 | serialiser.LoadPrimsFromXml2(CurrentOrFirstScene, filename); |
238 | } | 238 | } |
239 | 239 | ||
@@ -257,7 +257,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
257 | public void LoadArchiveToCurrentScene(string filename) | 257 | public void LoadArchiveToCurrentScene(string filename) |
258 | { | 258 | { |
259 | IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface<IRegionArchiverModule>(); | 259 | IRegionArchiverModule archiver = CurrentOrFirstScene.RequestModuleInterface<IRegionArchiverModule>(); |
260 | if (archiver != null) | 260 | if (archiver != null) |
261 | archiver.DearchiveRegion(filename); | 261 | archiver.DearchiveRegion(filename); |
262 | } | 262 | } |
263 | 263 | ||
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index ad5d56f..5c0024f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -263,7 +263,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
263 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) | 263 | if ((m_scene.TestBorderCross(val - Vector3.UnitX, Cardinals.E) || m_scene.TestBorderCross(val + Vector3.UnitX, Cardinals.W) |
264 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) | 264 | || m_scene.TestBorderCross(val - Vector3.UnitY, Cardinals.N) || m_scene.TestBorderCross(val + Vector3.UnitY, Cardinals.S)) |
265 | && !IsAttachmentCheckFull()) | 265 | && !IsAttachmentCheckFull()) |
266 | { | 266 | { |
267 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); | 267 | m_scene.CrossPrimGroupIntoNewRegion(val, this, true); |
268 | } | 268 | } |
269 | 269 | ||
@@ -454,7 +454,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
454 | /// <param name="scene"></param> | 454 | /// <param name="scene"></param> |
455 | public void AttachToScene(Scene scene) | 455 | public void AttachToScene(Scene scene) |
456 | { | 456 | { |
457 | m_scene = scene; | 457 | m_scene = scene; |
458 | RegionHandle = m_scene.RegionInfo.RegionHandle; | 458 | RegionHandle = m_scene.RegionInfo.RegionHandle; |
459 | 459 | ||
460 | if (m_rootPart.Shape.PCode != 9 || m_rootPart.Shape.State == 0) | 460 | if (m_rootPart.Shape.PCode != 9 || m_rootPart.Shape.State == 0) |
@@ -479,9 +479,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
479 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); | 479 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); |
480 | } | 480 | } |
481 | 481 | ||
482 | ApplyPhysics(m_scene.m_physicalPrim); | 482 | ApplyPhysics(m_scene.m_physicalPrim); |
483 | 483 | ||
484 | ScheduleGroupForFullUpdate(); | 484 | ScheduleGroupForFullUpdate(); |
485 | } | 485 | } |
486 | 486 | ||
487 | public Vector3 GroupScale() | 487 | public Vector3 GroupScale() |
@@ -1037,12 +1037,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1037 | m_rootPart = part; | 1037 | m_rootPart = part; |
1038 | if (!IsAttachment) | 1038 | if (!IsAttachment) |
1039 | part.ParentID = 0; | 1039 | part.ParentID = 0; |
1040 | part.LinkNum = 0; | 1040 | part.LinkNum = 0; |
1041 | 1041 | ||
1042 | // No locking required since the SOG should not be in the scene yet - one can't change root parts after | 1042 | // No locking required since the SOG should not be in the scene yet - one can't change root parts after |
1043 | // the scene object has been attached to the scene | 1043 | // the scene object has been attached to the scene |
1044 | m_parts.Add(m_rootPart.UUID, m_rootPart); | 1044 | m_parts.Add(m_rootPart.UUID, m_rootPart); |
1045 | } | 1045 | } |
1046 | 1046 | ||
1047 | /// <summary> | 1047 | /// <summary> |
1048 | /// Add a new part to this scene object. The part must already be correctly configured. | 1048 | /// Add a new part to this scene object. The part must already be correctly configured. |
@@ -1160,7 +1160,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1160 | 1160 | ||
1161 | /// <summary> | 1161 | /// <summary> |
1162 | /// Delete this group from its scene and tell all the scene presences about that deletion. | 1162 | /// Delete this group from its scene and tell all the scene presences about that deletion. |
1163 | /// </summary> | 1163 | /// </summary> |
1164 | /// <param name="silent">Broadcast deletions to all clients.</param> | 1164 | /// <param name="silent">Broadcast deletions to all clients.</param> |
1165 | public void DeleteGroup(bool silent) | 1165 | public void DeleteGroup(bool silent) |
1166 | { | 1166 | { |
@@ -1267,11 +1267,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
1267 | if (part.LocalId != m_rootPart.LocalId) | 1267 | if (part.LocalId != m_rootPart.LocalId) |
1268 | { | 1268 | { |
1269 | part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim); | 1269 | part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim); |
1270 | } | 1270 | } |
1271 | } | 1271 | } |
1272 | 1272 | ||
1273 | // Hack to get the physics scene geometries in the right spot | 1273 | // Hack to get the physics scene geometries in the right spot |
1274 | ResetChildPrimPhysicsPositions(); | 1274 | ResetChildPrimPhysicsPositions(); |
1275 | } | 1275 | } |
1276 | else | 1276 | else |
1277 | { | 1277 | { |
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1494 | List<SceneObjectPart> partList; | 1494 | List<SceneObjectPart> partList; |
1495 | 1495 | ||
1496 | lock (m_parts) | 1496 | lock (m_parts) |
1497 | { | 1497 | { |
1498 | partList = new List<SceneObjectPart>(m_parts.Values); | 1498 | partList = new List<SceneObjectPart>(m_parts.Values); |
1499 | } | 1499 | } |
1500 | 1500 | ||
@@ -1744,7 +1744,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1744 | rootpart.PhysActor.PIDHoverActive = false; | 1744 | rootpart.PhysActor.PIDHoverActive = false; |
1745 | } | 1745 | } |
1746 | } | 1746 | } |
1747 | } | 1747 | } |
1748 | } | 1748 | } |
1749 | 1749 | ||
1750 | /// <summary> | 1750 | /// <summary> |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index cce45fe..c915e9f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -42,7 +42,7 @@ using OpenSim.Region.Framework.Scenes.Scripting; | |||
42 | using OpenSim.Region.Physics.Manager; | 42 | using OpenSim.Region.Physics.Manager; |
43 | 43 | ||
44 | namespace OpenSim.Region.Framework.Scenes | 44 | namespace OpenSim.Region.Framework.Scenes |
45 | { | 45 | { |
46 | #region Enumerations | 46 | #region Enumerations |
47 | 47 | ||
48 | [Flags] | 48 | [Flags] |
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
187 | public IEntityInventory Inventory | 187 | public IEntityInventory Inventory |
188 | { | 188 | { |
189 | get { return m_inventory; } | 189 | get { return m_inventory; } |
190 | } | 190 | } |
191 | protected SceneObjectPartInventory m_inventory; | 191 | protected SceneObjectPartInventory m_inventory; |
192 | 192 | ||
193 | [XmlIgnore] | 193 | [XmlIgnore] |
@@ -309,9 +309,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
309 | RotationOffset = rotationOffset; | 309 | RotationOffset = rotationOffset; |
310 | Velocity = new Vector3(0, 0, 0); | 310 | Velocity = new Vector3(0, 0, 0); |
311 | AngularVelocity = new Vector3(0, 0, 0); | 311 | AngularVelocity = new Vector3(0, 0, 0); |
312 | Acceleration = new Vector3(0, 0, 0); | 312 | Acceleration = new Vector3(0, 0, 0); |
313 | m_TextureAnimation = new byte[0]; | 313 | m_TextureAnimation = new byte[0]; |
314 | m_particleSystem = new byte[0]; | 314 | m_particleSystem = new byte[0]; |
315 | 315 | ||
316 | // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, | 316 | // Prims currently only contain a single folder (Contents). From looking at the Second Life protocol, |
317 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from | 317 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from |
@@ -384,7 +384,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
384 | 384 | ||
385 | /// <value> | 385 | /// <value> |
386 | /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes | 386 | /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes |
387 | /// </value> | 387 | /// </value> |
388 | public TaskInventoryDictionary TaskInventory | 388 | public TaskInventoryDictionary TaskInventory |
389 | { | 389 | { |
390 | get { return m_inventory.Items; } | 390 | get { return m_inventory.Items; } |
@@ -3484,7 +3484,7 @@ if (m_shape != null) { | |||
3484 | } | 3484 | } |
3485 | else // it already has a physical representation | 3485 | else // it already has a physical representation |
3486 | { | 3486 | { |
3487 | pa.IsPhysical = UsePhysics; | 3487 | pa.IsPhysical = UsePhysics; |
3488 | 3488 | ||
3489 | DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim | 3489 | DoPhysicsPropertyUpdate(UsePhysics, false); // Update physical status. If it's phantom this will remove the prim |
3490 | if (m_parentGroup != null) | 3490 | if (m_parentGroup != null) |
@@ -3775,7 +3775,7 @@ if (m_shape != null) { | |||
3775 | public override string ToString() | 3775 | public override string ToString() |
3776 | { | 3776 | { |
3777 | return String.Format("{0} {1} (parent {2}))", Name, UUID, ParentGroup); | 3777 | return String.Format("{0} {1} (parent {2}))", Name, UUID, ParentGroup); |
3778 | } | 3778 | } |
3779 | 3779 | ||
3780 | #endregion Public Methods | 3780 | #endregion Public Methods |
3781 | 3781 | ||
@@ -3823,11 +3823,11 @@ if (m_shape != null) { | |||
3823 | _everyoneMask &= _nextOwnerMask; | 3823 | _everyoneMask &= _nextOwnerMask; |
3824 | 3824 | ||
3825 | Inventory.ApplyNextOwnerPermissions(); | 3825 | Inventory.ApplyNextOwnerPermissions(); |
3826 | } | 3826 | } |
3827 | 3827 | ||
3828 | public bool CanBeDeleted() | 3828 | public bool CanBeDeleted() |
3829 | { | 3829 | { |
3830 | return Inventory.CanBeDeleted(); | 3830 | return Inventory.CanBeDeleted(); |
3831 | } | 3831 | } |
3832 | } | 3832 | } |
3833 | } | 3833 | } |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 76bcd7e..098e010 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
105 | public void ForceInventoryPersistence() | 105 | public void ForceInventoryPersistence() |
106 | { | 106 | { |
107 | HasInventoryChanged = true; | 107 | HasInventoryChanged = true; |
108 | } | 108 | } |
109 | 109 | ||
110 | /// <summary> | 110 | /// <summary> |
111 | /// Reset UUIDs for all the items in the prim's inventory. This involves either generating | 111 | /// Reset UUIDs for all the items in the prim's inventory. This involves either generating |
@@ -164,7 +164,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
164 | /// <summary> | 164 | /// <summary> |
165 | /// Change every item in this inventory to a new group. | 165 | /// Change every item in this inventory to a new group. |
166 | /// </summary> | 166 | /// </summary> |
167 | /// <param name="groupID"></param> | 167 | /// <param name="groupID"></param> |
168 | public void ChangeInventoryGroup(UUID groupID) | 168 | public void ChangeInventoryGroup(UUID groupID) |
169 | { | 169 | { |
170 | lock (Items) | 170 | lock (Items) |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 286b7ca..0e1b8d9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -776,7 +776,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
776 | // Moved this from SendInitialData to ensure that m_appearance is initialized | 776 | // Moved this from SendInitialData to ensure that m_appearance is initialized |
777 | // before the inventory is processed in MakeRootAgent. This fixes a race condition | 777 | // before the inventory is processed in MakeRootAgent. This fixes a race condition |
778 | // related to the handling of attachments | 778 | // related to the handling of attachments |
779 | //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); | 779 | //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); |
780 | if (m_scene.TestBorderCross(pos, Cardinals.E)) | 780 | if (m_scene.TestBorderCross(pos, Cardinals.E)) |
781 | { | 781 | { |
782 | Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); | 782 | Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); |
@@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1235 | if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) | 1235 | if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) |
1236 | { | 1236 | { |
1237 | StandUp(); | 1237 | StandUp(); |
1238 | } | 1238 | } |
1239 | 1239 | ||
1240 | // Check if Client has camera in 'follow cam' or 'build' mode. | 1240 | // Check if Client has camera in 'follow cam' or 'build' mode. |
1241 | Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); | 1241 | Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); |
@@ -1489,7 +1489,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1489 | { | 1489 | { |
1490 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); | 1490 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); |
1491 | // m_log.DebugFormat( | 1491 | // m_log.DebugFormat( |
1492 | // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); | 1492 | // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); |
1493 | 1493 | ||
1494 | AddNewMovement(agent_control_v3, q); | 1494 | AddNewMovement(agent_control_v3, q); |
1495 | 1495 | ||
@@ -2306,7 +2306,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2306 | /// Rotate the avatar to the given rotation and apply a movement in the given relative vector | 2306 | /// Rotate the avatar to the given rotation and apply a movement in the given relative vector |
2307 | /// </summary> | 2307 | /// </summary> |
2308 | /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> | 2308 | /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> |
2309 | /// <param name="rotation">The direction in which this avatar should now face. | 2309 | /// <param name="rotation">The direction in which this avatar should now face. |
2310 | public void AddNewMovement(Vector3 vec, Quaternion rotation) | 2310 | public void AddNewMovement(Vector3 vec, Quaternion rotation) |
2311 | { | 2311 | { |
2312 | if (m_isChildAgent) | 2312 | if (m_isChildAgent) |
@@ -2649,7 +2649,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2649 | /// Tell the client for this scene presence what items it should be wearing now | 2649 | /// Tell the client for this scene presence what items it should be wearing now |
2650 | /// </summary> | 2650 | /// </summary> |
2651 | public void SendWearables() | 2651 | public void SendWearables() |
2652 | { | 2652 | { |
2653 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 2653 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
2654 | } | 2654 | } |
2655 | 2655 | ||
@@ -3175,7 +3175,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3175 | else | 3175 | else |
3176 | { | 3176 | { |
3177 | wears[i++] = UUID.Zero; | 3177 | wears[i++] = UUID.Zero; |
3178 | wears[i++] = UUID.Zero; | 3178 | wears[i++] = UUID.Zero; |
3179 | } | 3179 | } |
3180 | } | 3180 | } |
3181 | cAgent.Wearables = wears; | 3181 | cAgent.Wearables = wears; |
@@ -3487,7 +3487,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3487 | 3487 | ||
3488 | public bool HasAttachments() | 3488 | public bool HasAttachments() |
3489 | { | 3489 | { |
3490 | return m_attachments.Count > 0; | 3490 | return m_attachments.Count > 0; |
3491 | } | 3491 | } |
3492 | 3492 | ||
3493 | public bool HasScriptedAttachments() | 3493 | public bool HasScriptedAttachments() |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index fe74158..f7544ac 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -122,13 +122,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
122 | "[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); | 122 | "[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); |
123 | return null; | 123 | return null; |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | /// <summary> | 127 | /// <summary> |
128 | /// Serialize a scene object to the original xml format | 128 | /// Serialize a scene object to the original xml format |
129 | /// </summary> | 129 | /// </summary> |
130 | /// <param name="sceneObject"></param> | 130 | /// <param name="sceneObject"></param> |
131 | /// <returns></returns> | 131 | /// <returns></returns> |
132 | public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject) | 132 | public static string ToOriginalXmlFormat(SceneObjectGroup sceneObject) |
133 | { | 133 | { |
134 | using (StringWriter sw = new StringWriter()) | 134 | using (StringWriter sw = new StringWriter()) |
@@ -140,13 +140,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
140 | 140 | ||
141 | return sw.ToString(); | 141 | return sw.ToString(); |
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | /// <summary> | 145 | /// <summary> |
146 | /// Serialize a scene object to the original xml format | 146 | /// Serialize a scene object to the original xml format |
147 | /// </summary> | 147 | /// </summary> |
148 | /// <param name="sceneObject"></param> | 148 | /// <param name="sceneObject"></param> |
149 | /// <returns></returns> | 149 | /// <returns></returns> |
150 | public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer) | 150 | public static void ToOriginalXmlFormat(SceneObjectGroup sceneObject, XmlTextWriter writer) |
151 | { | 151 | { |
152 | //m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name); | 152 | //m_log.DebugFormat("[SERIALIZER]: Starting serialization of {0}", Name); |
@@ -238,13 +238,13 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
238 | m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); | 238 | m_log.ErrorFormat("[SERIALIZER]: Deserialization of xml failed with {0}. xml was {1}", e, xmlData); |
239 | return null; | 239 | return null; |
240 | } | 240 | } |
241 | } | 241 | } |
242 | 242 | ||
243 | /// <summary> | 243 | /// <summary> |
244 | /// Serialize a scene object to the 'xml2' format. | 244 | /// Serialize a scene object to the 'xml2' format. |
245 | /// </summary> | 245 | /// </summary> |
246 | /// <param name="sceneObject"></param> | 246 | /// <param name="sceneObject"></param> |
247 | /// <returns></returns> | 247 | /// <returns></returns> |
248 | public static string ToXml2Format(SceneObjectGroup sceneObject) | 248 | public static string ToXml2Format(SceneObjectGroup sceneObject) |
249 | { | 249 | { |
250 | using (StringWriter sw = new StringWriter()) | 250 | using (StringWriter sw = new StringWriter()) |
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
262 | /// Serialize a scene object to the 'xml2' format. | 262 | /// Serialize a scene object to the 'xml2' format. |
263 | /// </summary> | 263 | /// </summary> |
264 | /// <param name="sceneObject"></param> | 264 | /// <param name="sceneObject"></param> |
265 | /// <returns></returns> | 265 | /// <returns></returns> |
266 | public static void ToXml2Format(SceneObjectGroup sceneObject, XmlTextWriter writer) | 266 | public static void ToXml2Format(SceneObjectGroup sceneObject, XmlTextWriter writer) |
267 | { | 267 | { |
268 | //m_log.DebugFormat("[SERIALIZER]: Starting serialization of SOG {0} to XML2", Name); | 268 | //m_log.DebugFormat("[SERIALIZER]: Starting serialization of SOG {0} to XML2", Name); |
@@ -288,6 +288,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
288 | writer.WriteEndElement(); // End of SceneObjectGroup | 288 | writer.WriteEndElement(); // End of SceneObjectGroup |
289 | 289 | ||
290 | //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time); | 290 | //m_log.DebugFormat("[SERIALIZER]: Finished serialization of SOG {0} to XML2, {1}ms", Name, System.Environment.TickCount - time); |
291 | } | 291 | } |
292 | } | 292 | } |
293 | } | 293 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs index 7fa1b8c..cf0f345 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs | |||
@@ -236,7 +236,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
236 | } | 236 | } |
237 | 237 | ||
238 | SavePrimListToXml2(primList, fileName); | 238 | SavePrimListToXml2(primList, fileName); |
239 | } | 239 | } |
240 | 240 | ||
241 | public static void SavePrimListToXml2(List<EntityBase> entityList, string fileName) | 241 | public static void SavePrimListToXml2(List<EntityBase> entityList, string fileName) |
242 | { | 242 | { |
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs index 7f44bf1..ee288b3 100644 --- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs +++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||
@@ -450,7 +450,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
450 | { | 450 | { |
451 | addFrameMS(ms); | 451 | addFrameMS(ms); |
452 | addAgentMS(ms); | 452 | addAgentMS(ms); |
453 | } | 453 | } |
454 | 454 | ||
455 | #endregion | 455 | #endregion |
456 | } | 456 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index 3b0e77f..fc66c85 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
44 | { | 44 | { |
45 | [TestFixture, LongRunning] | 45 | [TestFixture, LongRunning] |
46 | public class EntityManagerTests | 46 | public class EntityManagerTests |
47 | { | 47 | { |
48 | static public Random random; | 48 | static public Random random; |
49 | SceneObjectGroup found; | 49 | SceneObjectGroup found; |
50 | Scene scene = SceneSetupHelpers.SetupScene(); | 50 | Scene scene = SceneSetupHelpers.SetupScene(); |
@@ -81,13 +81,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
81 | 81 | ||
82 | Assert.That(entman.ContainsKey(obj1), Is.False); | 82 | Assert.That(entman.ContainsKey(obj1), Is.False); |
83 | Assert.That(entman.ContainsKey(li1), Is.False); | 83 | Assert.That(entman.ContainsKey(li1), Is.False); |
84 | Assert.That(entman.ContainsKey(obj2), Is.False); | 84 | Assert.That(entman.ContainsKey(obj2), Is.False); |
85 | Assert.That(entman.ContainsKey(li2), Is.False); | 85 | Assert.That(entman.ContainsKey(li2), Is.False); |
86 | } | 86 | } |
87 | 87 | ||
88 | [Test] | 88 | [Test] |
89 | public void T011_ThreadAddRemoveTest() | 89 | public void T011_ThreadAddRemoveTest() |
90 | { | 90 | { |
91 | TestHelper.InMethod(); | 91 | TestHelper.InMethod(); |
92 | // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | 92 | // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); |
93 | 93 | ||
@@ -148,12 +148,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
148 | int size = random.Next(40,80); | 148 | int size = random.Next(40,80); |
149 | char ch ; | 149 | char ch ; |
150 | for (int i=0; i<size; i++) | 150 | for (int i=0; i<size; i++) |
151 | { | 151 | { |
152 | ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ; | 152 | ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65))) ; |
153 | name.Append(ch); | 153 | name.Append(ch); |
154 | } | 154 | } |
155 | return name.ToString(); | 155 | return name.ToString(); |
156 | } | 156 | } |
157 | } | 157 | } |
158 | 158 | ||
159 | public class NewTestThreads | 159 | public class NewTestThreads |
@@ -179,4 +179,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
179 | entman.Remove(sog.UUID); | 179 | entman.Remove(sog.UUID); |
180 | } | 180 | } |
181 | } | 181 | } |
182 | } \ No newline at end of file | 182 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index 105446d..288fb36 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -46,13 +46,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
46 | /// </summary> | 46 | /// </summary> |
47 | [TestFixture] | 47 | [TestFixture] |
48 | public class SceneObjectBasicTests | 48 | public class SceneObjectBasicTests |
49 | { | 49 | { |
50 | /// <summary> | 50 | /// <summary> |
51 | /// Test adding an object to a scene. | 51 | /// Test adding an object to a scene. |
52 | /// </summary> | 52 | /// </summary> |
53 | [Test, LongRunning] | 53 | [Test, LongRunning] |
54 | public void TestAddSceneObject() | 54 | public void TestAddSceneObject() |
55 | { | 55 | { |
56 | TestHelper.InMethod(); | 56 | TestHelper.InMethod(); |
57 | 57 | ||
58 | Scene scene = SceneSetupHelpers.SetupScene(); | 58 | Scene scene = SceneSetupHelpers.SetupScene(); |
@@ -61,7 +61,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
61 | 61 | ||
62 | //m_log.Debug("retrievedPart : {0}", retrievedPart); | 62 | //m_log.Debug("retrievedPart : {0}", retrievedPart); |
63 | // If the parts have the same UUID then we will consider them as one and the same | 63 | // If the parts have the same UUID then we will consider them as one and the same |
64 | Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); | 64 | Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); |
65 | } | 65 | } |
66 | 66 | ||
67 | /// <summary> | 67 | /// <summary> |
@@ -72,11 +72,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
72 | { | 72 | { |
73 | TestHelper.InMethod(); | 73 | TestHelper.InMethod(); |
74 | 74 | ||
75 | TestScene scene = SceneSetupHelpers.SetupScene(); | 75 | TestScene scene = SceneSetupHelpers.SetupScene(); |
76 | SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); | 76 | SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene); |
77 | scene.DeleteSceneObject(part.ParentGroup, false); | 77 | scene.DeleteSceneObject(part.ParentGroup, false); |
78 | 78 | ||
79 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 79 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
80 | Assert.That(retrievedPart, Is.Null); | 80 | Assert.That(retrievedPart, Is.Null); |
81 | } | 81 | } |
82 | 82 | ||
@@ -115,13 +115,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
115 | //[Test] | 115 | //[Test] |
116 | //public void TestDeleteSceneObjectAsyncToUserInventory() | 116 | //public void TestDeleteSceneObjectAsyncToUserInventory() |
117 | //{ | 117 | //{ |
118 | // TestHelper.InMethod(); | 118 | // TestHelper.InMethod(); |
119 | // //log4net.Config.XmlConfigurator.Configure(); | 119 | // //log4net.Config.XmlConfigurator.Configure(); |
120 | 120 | ||
121 | // UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 121 | // UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
122 | // string myObjectName = "Fred"; | 122 | // string myObjectName = "Fred"; |
123 | 123 | ||
124 | // TestScene scene = SceneSetupHelpers.SetupScene(); | 124 | // TestScene scene = SceneSetupHelpers.SetupScene(); |
125 | // SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene, myObjectName); | 125 | // SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene, myObjectName); |
126 | 126 | ||
127 | // Assert.That( | 127 | // Assert.That( |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index bf13607..e15dc84 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Linking tests | 46 | /// Linking tests |
47 | /// </summary> | 47 | /// </summary> |
48 | [TestFixture] | 48 | [TestFixture] |
49 | public class SceneObjectLinkingTests | 49 | public class SceneObjectLinkingTests |
50 | { | 50 | { |
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -174,13 +174,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
174 | // Link grp4 to grp3. | 174 | // Link grp4 to grp3. |
175 | grp3.LinkToGroup(grp4); | 175 | grp3.LinkToGroup(grp4); |
176 | 176 | ||
177 | // At this point we should have 4 parts total in two groups. | 177 | // At this point we should have 4 parts total in two groups. |
178 | Assert.That(grp1.Children.Count == 2); | 178 | Assert.That(grp1.Children.Count == 2); |
179 | Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link."); | 179 | Assert.That(grp2.IsDeleted, "Group 2 was not registered as deleted after link."); |
180 | Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink."); | 180 | Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained parts after delink."); |
181 | Assert.That(grp3.Children.Count == 2); | 181 | Assert.That(grp3.Children.Count == 2); |
182 | Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link."); | 182 | Assert.That(grp4.IsDeleted, "Group 4 was not registered as deleted after link."); |
183 | Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink."); | 183 | Assert.That(grp4.Children.Count, Is.EqualTo(0), "Group 4 still contained parts after delink."); |
184 | 184 | ||
185 | if (debugtest) | 185 | if (debugtest) |
186 | { | 186 | { |
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
194 | m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation); | 194 | m_log.Debug("Group3: Pos:"+grp3.AbsolutePosition+", Rot:"+grp3.Rotation); |
195 | m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset); | 195 | m_log.Debug("Group3: Prim1: OffsetPosition:"+part3.OffsetPosition+", OffsetRotation:"+part3.RotationOffset); |
196 | m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset); | 196 | m_log.Debug("Group3: Prim2: OffsetPosition:"+part4.OffsetPosition+", OffsetRotation:"+part4.RotationOffset); |
197 | } | 197 | } |
198 | 198 | ||
199 | // Required for linking | 199 | // Required for linking |
200 | grp1.RootPart.UpdateFlag = 0; | 200 | grp1.RootPart.UpdateFlag = 0; |
@@ -253,6 +253,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
253 | && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) | 253 | && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) |
254 | && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) | 254 | && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) |
255 | && (part4.RotationOffset.W - compareQuaternion.W < 0.00003)); | 255 | && (part4.RotationOffset.W - compareQuaternion.W < 0.00003)); |
256 | } | 256 | } |
257 | } | 257 | } |
258 | } | 258 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index 1c9bce4..8a27b7b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | |||
@@ -41,11 +41,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
41 | public class SceneTests | 41 | public class SceneTests |
42 | { | 42 | { |
43 | private class FakeStorageManager : StorageManager | 43 | private class FakeStorageManager : StorageManager |
44 | { | 44 | { |
45 | private class FakeRegionDataStore : IRegionDataStore | 45 | private class FakeRegionDataStore : IRegionDataStore |
46 | { | 46 | { |
47 | public void Initialise(string filename) | 47 | public void Initialise(string filename) |
48 | { | 48 | { |
49 | } | 49 | } |
50 | 50 | ||
51 | public void Dispose() | 51 | public void Dispose() |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index 751c1cd..b46eb8e 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
44 | { | 44 | { |
45 | /// <summary> | 45 | /// <summary> |
46 | /// Teleport tests in a standalone OpenSim | 46 | /// Teleport tests in a standalone OpenSim |
47 | /// </summary> | 47 | /// </summary> |
48 | [TestFixture] | 48 | [TestFixture] |
49 | public class StandaloneTeleportTests | 49 | public class StandaloneTeleportTests |
50 | { | 50 | { |
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
53 | /// </summary> | 53 | /// </summary> |
54 | /// Does not yet do what is says on the tin. | 54 | /// Does not yet do what is says on the tin. |
55 | /// Commenting for now | 55 | /// Commenting for now |
56 | //[Test, LongRunning] | 56 | //[Test, LongRunning] |
57 | public void TestSimpleNotNeighboursTeleport() | 57 | public void TestSimpleNotNeighboursTeleport() |
58 | { | 58 | { |
59 | TestHelper.InMethod(); | 59 | TestHelper.InMethod(); |
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index f449e18..525a93a 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
41 | { | 41 | { |
42 | /// <summary> | 42 | /// <summary> |
43 | /// Gather uuids for a given entity. | 43 | /// Gather uuids for a given entity. |
44 | /// </summary> | 44 | /// </summary> |
45 | /// | 45 | /// |
46 | /// This does a deep inspection of the entity to retrieve all the assets it uses (whether as textures, as scripts | 46 | /// This does a deep inspection of the entity to retrieve all the assets it uses (whether as textures, as scripts |
47 | /// contained in inventory, as scripts contained in objects contained in another object's inventory, etc. Assets | 47 | /// contained in inventory, as scripts contained in objects contained in another object's inventory, etc. Assets |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
82 | /// | 82 | /// |
83 | /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param> | 83 | /// <param name="assetUuid">The uuid of the asset for which to gather referenced assets</param> |
84 | /// <param name="assetType">The type of the asset for the uuid given</param> | 84 | /// <param name="assetType">The type of the asset for the uuid given</param> |
85 | /// <param name="assetUuids">The assets gathered</param> | 85 | /// <param name="assetUuids">The assets gathered</param> |
86 | public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, int> assetUuids) | 86 | public void GatherAssetUuids(UUID assetUuid, AssetType assetType, IDictionary<UUID, int> assetUuids) |
87 | { | 87 | { |
88 | assetUuids[assetUuid] = 1; | 88 | assetUuids[assetUuid] = 1; |
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
142 | 142 | ||
143 | // If the prim is a sculpt then preserve this information too | 143 | // If the prim is a sculpt then preserve this information too |
144 | if (part.Shape.SculptTexture != UUID.Zero) | 144 | if (part.Shape.SculptTexture != UUID.Zero) |
145 | assetUuids[part.Shape.SculptTexture] = 1; | 145 | assetUuids[part.Shape.SculptTexture] = 1; |
146 | 146 | ||
147 | TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); | 147 | TaskInventoryDictionary taskDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); |
148 | 148 | ||
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
167 | 167 | ||
168 | /// <summary> | 168 | /// <summary> |
169 | /// The callback made when we request the asset for an object from the asset service. | 169 | /// The callback made when we request the asset for an object from the asset service. |
170 | /// </summary> | 170 | /// </summary> |
171 | protected void AssetReceived(string id, Object sender, AssetBase asset) | 171 | protected void AssetReceived(string id, Object sender, AssetBase asset) |
172 | { | 172 | { |
173 | lock (this) | 173 | lock (this) |
@@ -242,7 +242,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
242 | AssetBase assetBase = GetAsset(wearableAssetUuid); | 242 | AssetBase assetBase = GetAsset(wearableAssetUuid); |
243 | 243 | ||
244 | if (null != assetBase) | 244 | if (null != assetBase) |
245 | { | 245 | { |
246 | //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data)); | 246 | //m_log.Debug(new System.Text.ASCIIEncoding().GetString(bodypartAsset.Data)); |
247 | AssetWearable wearableAsset = new AssetBodypart(wearableAssetUuid, assetBase.Data); | 247 | AssetWearable wearableAsset = new AssetBodypart(wearableAssetUuid, assetBase.Data); |
248 | wearableAsset.Decode(); | 248 | wearableAsset.Decode(); |
@@ -275,6 +275,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
275 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | 275 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); |
276 | GatherAssetUuids(sog, assetUuids); | 276 | GatherAssetUuids(sog, assetUuids); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | } | 279 | } |
280 | } \ No newline at end of file | 280 | } \ No newline at end of file |