aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs4
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs2
7 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 4c3d00e..1e6955a 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -439,10 +439,10 @@ namespace OpenSim.Region.Framework.Scenes
439 protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient) 439 protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient)
440 { 440 {
441 SceneObjectGroup group = GetGroupByPrim(objectLocalID); 441 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
442 if( group != null ) 442 if (group != null)
443 { 443 {
444 //group.DetachToGround(); 444 //group.DetachToGround();
445 m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(),remoteClient); 445 m_parentScene.DetachSingleAttachmentToInv(group.GetFromAssetID(), remoteClient);
446 } 446 }
447 } 447 }
448 448
@@ -460,7 +460,7 @@ namespace OpenSim.Region.Framework.Scenes
460 IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage) 460 IClientAPI remoteClient, UUID GroupID, uint objectLocalID, UUID Garbage)
461 { 461 {
462 SceneObjectGroup group = GetGroupByPrim(objectLocalID); 462 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
463 if( group != null ) 463 if (group != null)
464 { 464 {
465 if (group.OwnerID == remoteClient.AgentId) 465 if (group.OwnerID == remoteClient.AgentId)
466 group.SetGroup(GroupID, remoteClient); 466 group.SetGroup(GroupID, remoteClient);
@@ -553,7 +553,7 @@ namespace OpenSim.Region.Framework.Scenes
553 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent) 553 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
554 { 554 {
555 SceneObjectGroup group = GetGroupByPrim(objectLocalID); 555 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
556 if( group != null ) 556 if (group != null)
557 { 557 {
558 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId)) 558 if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
559 { 559 {
@@ -1534,7 +1534,7 @@ namespace OpenSim.Region.Framework.Scenes
1534 for (int i = childPrimIds.Count - 1; i >= 0; i--) 1534 for (int i = childPrimIds.Count - 1; i >= 0; i--)
1535 { 1535 {
1536 SceneObjectGroup child = GetGroupByPrim(childPrimIds[i]); 1536 SceneObjectGroup child = GetGroupByPrim(childPrimIds[i]);
1537 if( child != null ) 1537 if (child != null)
1538 { 1538 {
1539 // Make sure no child prim is set for sale 1539 // Make sure no child prim is set for sale
1540 // So that, on delink, no prims are unwittingly 1540 // So that, on delink, no prims are unwittingly
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4fdc71e..8e4a9d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2357,7 +2357,7 @@ namespace OpenSim.Region.Framework.Scenes
2357 { 2357 {
2358 if (m_rootPart.PhysActor.IsPhysical) 2358 if (m_rootPart.PhysActor.IsPhysical)
2359 { 2359 {
2360 if(m_rootPart.IsWaitingForFirstSpinUpdatePacket) 2360 if (m_rootPart.IsWaitingForFirstSpinUpdatePacket)
2361 { 2361 {
2362 // first time initialization of "old" orientation for calculation of delta rotations 2362 // first time initialization of "old" orientation for calculation of delta rotations
2363 m_rootPart.SpinOldOrientation = newOrientation; 2363 m_rootPart.SpinOldOrientation = newOrientation;
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
index 13874fa..fdc2bd9 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/IRCBridgeModule.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
153 153
154 region.Close(); 154 region.Close();
155 155
156 if(m_regions.Contains(region)) 156 if (m_regions.Contains(region))
157 { 157 {
158 lock (m_regions) m_regions.Remove(region); 158 lock (m_regions) m_regions.Remove(region);
159 } 159 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
index 5c249b9..0572fc7 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
75 { 75 {
76 if (script.StartsWith("//MRM:C#")) 76 if (script.StartsWith("//MRM:C#"))
77 { 77 {
78 if(m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID) 78 if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.MasterAvatarAssignedUUID)
79 return; 79 return;
80 80
81 try 81 try
@@ -221,7 +221,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
221 string[] lines = Script.Split(new string[] {"\n"}, StringSplitOptions.RemoveEmptyEntries); 221 string[] lines = Script.Split(new string[] {"\n"}, StringSplitOptions.RemoveEmptyEntries);
222 foreach (string s in lines) 222 foreach (string s in lines)
223 { 223 {
224 if(s.StartsWith("//@DEPENDS:")) 224 if (s.StartsWith("//@DEPENDS:"))
225 { 225 {
226 libraries.Add(s.Replace("//@DEPENDS:", "")); 226 libraries.Add(s.Replace("//@DEPENDS:", ""));
227 } 227 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
index d726de7..22a1126 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
65 { 65 {
66 add 66 add
67 { 67 {
68 if(!_OnTouchActive) 68 if (!_OnTouchActive)
69 { 69 {
70 GetSOP().Flags |= PrimFlags.Touch; 70 GetSOP().Flags |= PrimFlags.Touch;
71 _OnTouchActive = true; 71 _OnTouchActive = true;
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
index 1fb7715..778bf7d 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/Test/DrunkenTextAppreciationModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim
50 } 50 }
51 } 51 }
52 52
53 if(e.Sender is IObject) 53 if (e.Sender is IObject)
54 { 54 {
55 // Ignore 55 // Ignore
56 } 56 }
@@ -61,4 +61,4 @@ namespace OpenSim
61 61
62 } 62 }
63 } 63 }
64} \ No newline at end of file 64}
diff --git a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
index f2b3e81..cbbe86d 100644
--- a/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
130 130
131 private void HandleChatPacket(OSChatMessage chat) 131 private void HandleChatPacket(OSChatMessage chat)
132 { 132 {
133 if(string.IsNullOrEmpty(chat.Message)) 133 if (string.IsNullOrEmpty(chat.Message))
134 return; 134 return;
135 135
136 // Object? 136 // Object?