OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-10-05 14:15:39 +00:00
parent a243a4aaf5
commit aab6cdd8b0
11 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -460,7 +460,7 @@ namespace OpenSim.Grid.UserServer
UUID uid;
string pass = requestData["password"].ToString();
if(!UUID.TryParse((string) requestData["avatar_uuid"], out uid))
if (!UUID.TryParse((string) requestData["avatar_uuid"], out uid))
{
responseData["error"] = "No authorization";
response.Value = responseData;

16
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -857,7 +857,7 @@ namespace OpenSim.Region.Environment.Scenes
else
return null;
}
/// <summary>
/// Get a named prim contained in this scene (will return the first
/// found, if there are more than one prim with the same name)
@ -872,13 +872,13 @@ namespace OpenSim.Region.Environment.Scenes
{
if (ent is SceneObjectGroup)
{
foreach(SceneObjectPart p in ((SceneObjectGroup) ent).GetParts())
{
if (p.Name==name)
{
return p;
}
}
foreach (SceneObjectPart p in ((SceneObjectGroup) ent).GetParts())
{
if (p.Name==name)
{
return p;
}
}
}
}
return null;

4
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -2292,7 +2292,7 @@ namespace OpenSim.Region.Environment.Scenes
public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient)
{
SceneObjectPart part = GetSceneObjectPart(itemID);
if(part == null || part.ParentGroup == null)
if (part == null || part.ParentGroup == null)
return;
UUID inventoryID = part.ParentGroup.GetFromAssetID();
@ -2300,7 +2300,7 @@ namespace OpenSim.Region.Environment.Scenes
ScenePresence presence;
if (TryGetAvatar(remoteClient.AgentId, out presence))
{
if(!ExternalChecks.ExternalChecksCanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition))
if (!ExternalChecks.ExternalChecksCanRezObject(part.ParentGroup.Children.Count, remoteClient.AgentId, presence.AbsolutePosition))
return;
presence.Appearance.DetachAttachment(itemID);

2
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -3896,7 +3896,7 @@ namespace OpenSim.Region.Environment.Scenes
// }
// }
/// <summary>
/// <summary>
/// Get a named prim contained in this scene (will return the first
/// found, if there are more than one prim with the same name)
/// </summary>

2
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -2759,7 +2759,7 @@ namespace OpenSim.Region.Environment.Scenes
public void SetAttachmentPoint(byte point)
{
lock(m_parts)
lock (m_parts)
{
foreach (SceneObjectPart part in m_parts.Values)
part.SetAttachmentPoint(point);

36
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueThreadClass.cs
View File

@ -202,9 +202,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
}
catch (Exception e)
{
if (lastScriptEngine != null)
lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown",ScriptEngineName,e.GetType().ToString());
throw e;
if (lastScriptEngine != null)
lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown", ScriptEngineName, e.GetType().ToString());
throw e;
}
}
}
@ -216,7 +216,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
public void DoProcessQueue()
{
foreach (ScriptEngine m_ScriptEngine in
new ArrayList(ScriptEngine.ScriptEngines))
new ArrayList(ScriptEngine.ScriptEngines))
{
lastScriptEngine = m_ScriptEngine;
@ -290,21 +290,21 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
InExecution = false;
}
}
catch (SelfDeleteException sde)
{
// Make sure this exception isn't consumed here... we need it
throw sde;
}
catch (TargetInvocationException tie)
{
// Probably don't need to special case this one
throw tie;
}
catch (SelfDeleteException sde)
{
// Make sure this exception isn't consumed here... we need it
throw sde;
}
catch (TargetInvocationException tie)
{
// Probably don't need to special case this one
throw tie;
}
catch (Exception e)
{
InExecution = false;
string text = FormatException(e, QIS.LineMap);
InExecution = false;
string text = FormatException(e, QIS.LineMap);
// DISPLAY ERROR INWORLD
// if (e.InnerException != null)
@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
catch (Exception)
{
m_ScriptEngine.m_EventQueueManager.
m_ScriptEngine.Log.Error("[" +
m_ScriptEngine.Log.Error("[" +
ScriptEngineName + "]: " +
"Unable to send text in-world:\r\n" +
text);

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -4699,7 +4699,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (cindex > 0)
{
ret.Add(str.Substring(0, cindex));
}
}
// Cannot use spacers.Contains() because spacers may be either type String or LSLString
for (int j = 0; j < spacers.Length; j++)
{

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
View File

@ -710,18 +710,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return String.Empty;
}
}
public string osGetSimulatorVersion()
{
public string osGetSimulatorVersion()
{
// High because it can be used to target attacks to known weaknesses
// This would allow a new class of griefer scripts that don't even
// require their user to know what they are doing (see script
// kiddie)
//
CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
m_host.AddScriptLPS(1);
return m_ScriptEngine.World.GetSimulatorVersion();
}
CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
m_host.AddScriptLPS(1);
return m_ScriptEngine.World.GetSimulatorVersion();
}
//for testing purposes only

2
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
View File

@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void osSetRegionWaterHeight(double height);
string osGetScriptEngineName();
string osGetSimulatorVersion();
string osGetSimulatorVersion();
void osSetParcelMediaTime(double time);
Hashtable osParseJSON(string JSON);

26
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
View File

@ -191,19 +191,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
//Console.WriteLine("ScriptEngine: Executing function name: " + EventName);
#endif
// Found
try
{
ev.Invoke(m_Script, args);
}
catch (TargetInvocationException tie)
{
// Grab the inner exception and rethrow it
throw tie.InnerException;
}
catch (Exception e)
{
throw e;
}
try
{
ev.Invoke(m_Script, args);
}
catch (TargetInvocationException tie)
{
// Grab the inner exception and rethrow it
throw tie.InnerException;
}
catch (Exception e)
{
throw e;
}
}
protected void initEventFlags()

10
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
View File

@ -214,11 +214,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{
return m_OSSL_Functions.osGetScriptEngineName();
}
public string osGetSimulatorVersion()
{
return m_OSSL_Functions.osGetSimulatorVersion();
}
public string osGetSimulatorVersion()
{
return m_OSSL_Functions.osGetSimulatorVersion();
}
//for testing purposes only