diff options
Diffstat (limited to 'OpenSim')
11 files changed, 58 insertions, 58 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index fa3cfbd..1a69760 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
@@ -460,7 +460,7 @@ namespace OpenSim.Grid.UserServer | |||
460 | UUID uid; | 460 | UUID uid; |
461 | string pass = requestData["password"].ToString(); | 461 | string pass = requestData["password"].ToString(); |
462 | 462 | ||
463 | if(!UUID.TryParse((string) requestData["avatar_uuid"], out uid)) | 463 | if (!UUID.TryParse((string) requestData["avatar_uuid"], out uid)) |
464 | { | 464 | { |
465 | responseData["error"] = "No authorization"; | 465 | responseData["error"] = "No authorization"; |
466 | response.Value = responseData; | 466 | response.Value = responseData; |
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 6b3e796..fdde801 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -857,7 +857,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
857 | else | 857 | else |
858 | return null; | 858 | return null; |
859 | } | 859 | } |
860 | 860 | ||
861 | /// <summary> | 861 | /// <summary> |
862 | /// Get a named prim contained in this scene (will return the first | 862 | /// Get a named prim contained in this scene (will return the first |
863 | /// found, if there are more than one prim with the same name) | 863 | /// found, if there are more than one prim with the same name) |
@@ -872,13 +872,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
872 | { | 872 | { |
873 | if (ent is SceneObjectGroup) | 873 | if (ent is SceneObjectGroup) |
874 | { | 874 | { |
875 | foreach(SceneObjectPart p in ((SceneObjectGroup) ent).GetParts()) | 875 | foreach (SceneObjectPart p in ((SceneObjectGroup) ent).GetParts()) |
876 | { | 876 | { |
877 | if (p.Name==name) | 877 | if (p.Name==name) |
878 | { | 878 | { |
879 | return p; | 879 | return p; |
880 | } | 880 | } |
881 | } | 881 | } |
882 | } | 882 | } |
883 | } | 883 | } |
884 | return null; | 884 | return null; |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index 2285b04..729572a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -2292,7 +2292,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2292 | public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient) | 2292 | public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient) |
2293 | { | 2293 | { |
2294 | SceneObjectPart part = GetSceneObjectPart(itemID); | 2294 | SceneObjectPart part = GetSceneObjectPart(itemID); |
2295 | if(part == null || part.ParentGroup == null) | 2295 | if (part == null || part.ParentGroup == null) |
2296 | return; | 2296 | return; |
2297 | 2297 | ||
2298 | UUID inventoryID = part.ParentGroup.GetFromAssetID(); | 2298 | UUID inventoryID = part.ParentGroup.GetFromAssetID(); |
@@ -2300,7 +2300,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2300 | ScenePresence presence; | 2300 | ScenePresence presence; |
2301 | if (TryGetAvatar(remoteClient.AgentId, out presence)) | 2301 | if (TryGetAvatar(remoteClient.AgentId, out presence)) |
2302 | { | 2302 | { |
2303 | if(!ExternalChecks.ExternalChecksCanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) | 2303 | if (!ExternalChecks.ExternalChecksCanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition)) |
2304 | return; | 2304 | return; |
2305 | 2305 | ||
2306 | presence.Appearance.DetachAttachment(itemID); | 2306 | presence.Appearance.DetachAttachment(itemID); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 7b9183a..342742d 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -3896,7 +3896,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3896 | // } | 3896 | // } |
3897 | // } | 3897 | // } |
3898 | 3898 | ||
3899 | /// <summary> | 3899 | /// <summary> |
3900 | /// Get a named prim contained in this scene (will return the first | 3900 | /// Get a named prim contained in this scene (will return the first |
3901 | /// found, if there are more than one prim with the same name) | 3901 | /// found, if there are more than one prim with the same name) |
3902 | /// </summary> | 3902 | /// </summary> |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 9e605c1..08623aa 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -2759,7 +2759,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2759 | 2759 | ||
2760 | public void SetAttachmentPoint(byte point) | 2760 | public void SetAttachmentPoint(byte point) |
2761 | { | 2761 | { |
2762 | lock(m_parts) | 2762 | lock (m_parts) |
2763 | { | 2763 | { |
2764 | foreach (SceneObjectPart part in m_parts.Values) | 2764 | foreach (SceneObjectPart part in m_parts.Values) |
2765 | part.SetAttachmentPoint(point); | 2765 | part.SetAttachmentPoint(point); |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs index f568dc5..1acb1b5 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs | |||
@@ -202,9 +202,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
202 | } | 202 | } |
203 | catch (Exception e) | 203 | catch (Exception e) |
204 | { | 204 | { |
205 | if (lastScriptEngine != null) | 205 | if (lastScriptEngine != null) |
206 | lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown",ScriptEngineName,e.GetType().ToString()); | 206 | lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown", ScriptEngineName, e.GetType().ToString()); |
207 | throw e; | 207 | throw e; |
208 | } | 208 | } |
209 | } | 209 | } |
210 | } | 210 | } |
@@ -216,7 +216,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
216 | public void DoProcessQueue() | 216 | public void DoProcessQueue() |
217 | { | 217 | { |
218 | foreach (ScriptEngine m_ScriptEngine in | 218 | foreach (ScriptEngine m_ScriptEngine in |
219 | new ArrayList(ScriptEngine.ScriptEngines)) | 219 | new ArrayList(ScriptEngine.ScriptEngines)) |
220 | { | 220 | { |
221 | lastScriptEngine = m_ScriptEngine; | 221 | lastScriptEngine = m_ScriptEngine; |
222 | 222 | ||
@@ -290,21 +290,21 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
290 | InExecution = false; | 290 | InExecution = false; |
291 | } | 291 | } |
292 | } | 292 | } |
293 | catch (SelfDeleteException sde) | 293 | catch (SelfDeleteException sde) |
294 | { | 294 | { |
295 | // Make sure this exception isn't consumed here... we need it | 295 | // Make sure this exception isn't consumed here... we need it |
296 | throw sde; | 296 | throw sde; |
297 | } | 297 | } |
298 | catch (TargetInvocationException tie) | 298 | catch (TargetInvocationException tie) |
299 | { | 299 | { |
300 | // Probably don't need to special case this one | 300 | // Probably don't need to special case this one |
301 | throw tie; | 301 | throw tie; |
302 | } | 302 | } |
303 | catch (Exception e) | 303 | catch (Exception e) |
304 | { | 304 | { |
305 | InExecution = false; | 305 | InExecution = false; |
306 | string text = FormatException(e, QIS.LineMap); | 306 | string text = FormatException(e, QIS.LineMap); |
307 | 307 | ||
308 | // DISPLAY ERROR INWORLD | 308 | // DISPLAY ERROR INWORLD |
309 | 309 | ||
310 | // if (e.InnerException != null) | 310 | // if (e.InnerException != null) |
@@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
340 | catch (Exception) | 340 | catch (Exception) |
341 | { | 341 | { |
342 | m_ScriptEngine.m_EventQueueManager. | 342 | m_ScriptEngine.m_EventQueueManager. |
343 | m_ScriptEngine.Log.Error("[" + | 343 | m_ScriptEngine.Log.Error("[" + |
344 | ScriptEngineName + "]: " + | 344 | ScriptEngineName + "]: " + |
345 | "Unable to send text in-world:\r\n" + | 345 | "Unable to send text in-world:\r\n" + |
346 | text); | 346 | text); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 655d85c..fffc331 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -4699,7 +4699,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
4699 | if (cindex > 0) | 4699 | if (cindex > 0) |
4700 | { | 4700 | { |
4701 | ret.Add(str.Substring(0, cindex)); | 4701 | ret.Add(str.Substring(0, cindex)); |
4702 | } | 4702 | } |
4703 | // Cannot use spacers.Contains() because spacers may be either type String or LSLString | 4703 | // Cannot use spacers.Contains() because spacers may be either type String or LSLString |
4704 | for (int j = 0; j < spacers.Length; j++) | 4704 | for (int j = 0; j < spacers.Length; j++) |
4705 | { | 4705 | { |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index bfe289c..ee95342 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -710,18 +710,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
710 | return String.Empty; | 710 | return String.Empty; |
711 | } | 711 | } |
712 | } | 712 | } |
713 | 713 | ||
714 | public string osGetSimulatorVersion() | 714 | public string osGetSimulatorVersion() |
715 | { | 715 | { |
716 | // High because it can be used to target attacks to known weaknesses | 716 | // High because it can be used to target attacks to known weaknesses |
717 | // This would allow a new class of griefer scripts that don't even | 717 | // This would allow a new class of griefer scripts that don't even |
718 | // require their user to know what they are doing (see script | 718 | // require their user to know what they are doing (see script |
719 | // kiddie) | 719 | // kiddie) |
720 | // | 720 | // |
721 | CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion"); | 721 | CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion"); |
722 | m_host.AddScriptLPS(1); | 722 | m_host.AddScriptLPS(1); |
723 | return m_ScriptEngine.World.GetSimulatorVersion(); | 723 | return m_ScriptEngine.World.GetSimulatorVersion(); |
724 | } | 724 | } |
725 | 725 | ||
726 | 726 | ||
727 | //for testing purposes only | 727 | //for testing purposes only |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 48eddd2..92b77a4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
85 | void osSetRegionWaterHeight(double height); | 85 | void osSetRegionWaterHeight(double height); |
86 | 86 | ||
87 | string osGetScriptEngineName(); | 87 | string osGetScriptEngineName(); |
88 | string osGetSimulatorVersion(); | 88 | string osGetSimulatorVersion(); |
89 | void osSetParcelMediaTime(double time); | 89 | void osSetParcelMediaTime(double time); |
90 | Hashtable osParseJSON(string JSON); | 90 | Hashtable osParseJSON(string JSON); |
91 | 91 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs index 5c1c57a..90598c1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs | |||
@@ -191,19 +191,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
191 | //Console.WriteLine("ScriptEngine: Executing function name: " + EventName); | 191 | //Console.WriteLine("ScriptEngine: Executing function name: " + EventName); |
192 | #endif | 192 | #endif |
193 | // Found | 193 | // Found |
194 | try | 194 | try |
195 | { | 195 | { |
196 | ev.Invoke(m_Script, args); | 196 | ev.Invoke(m_Script, args); |
197 | } | 197 | } |
198 | catch (TargetInvocationException tie) | 198 | catch (TargetInvocationException tie) |
199 | { | 199 | { |
200 | // Grab the inner exception and rethrow it | 200 | // Grab the inner exception and rethrow it |
201 | throw tie.InnerException; | 201 | throw tie.InnerException; |
202 | } | 202 | } |
203 | catch (Exception e) | 203 | catch (Exception e) |
204 | { | 204 | { |
205 | throw e; | 205 | throw e; |
206 | } | 206 | } |
207 | } | 207 | } |
208 | 208 | ||
209 | protected void initEventFlags() | 209 | protected void initEventFlags() |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index f3ca326..d92ae7f 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -214,11 +214,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
214 | { | 214 | { |
215 | return m_OSSL_Functions.osGetScriptEngineName(); | 215 | return m_OSSL_Functions.osGetScriptEngineName(); |
216 | } | 216 | } |
217 | 217 | ||
218 | public string osGetSimulatorVersion() | 218 | public string osGetSimulatorVersion() |
219 | { | 219 | { |
220 | return m_OSSL_Functions.osGetSimulatorVersion(); | 220 | return m_OSSL_Functions.osGetSimulatorVersion(); |
221 | } | 221 | } |
222 | 222 | ||
223 | 223 | ||
224 | //for testing purposes only | 224 | //for testing purposes only |