aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules
diff options
context:
space:
mode:
authorJeff Ames2009-04-14 11:38:33 +0000
committerJeff Ames2009-04-14 11:38:33 +0000
commitcad0aab7934bf0f81634c44fc03876f4b252eaa8 (patch)
tree36883ff05989dd98d67902dab94922fca6b564f7 /OpenSim/Region/OptionalModules
parentAdd copyright headers. (diff)
downloadopensim-SC-cad0aab7934bf0f81634c44fc03876f4b252eaa8.zip
opensim-SC-cad0aab7934bf0f81634c44fc03876f4b252eaa8.tar.gz
opensim-SC-cad0aab7934bf0f81634c44fc03876f4b252eaa8.tar.bz2
opensim-SC-cad0aab7934bf0f81634c44fc03876f4b252eaa8.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-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
5 files changed, 7 insertions, 7 deletions
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?