Update svn properties, minor formatting cleanup.
parent
a243a4aaf5
commit
aab6cdd8b0
|
@ -460,7 +460,7 @@ namespace OpenSim.Grid.UserServer
|
||||||
UUID uid;
|
UUID uid;
|
||||||
string pass = requestData["password"].ToString();
|
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";
|
responseData["error"] = "No authorization";
|
||||||
response.Value = responseData;
|
response.Value = responseData;
|
||||||
|
|
|
@ -857,7 +857,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
else
|
else
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get a named prim contained in this scene (will return the first
|
/// Get a named prim contained in this scene (will return the first
|
||||||
/// found, if there are more than one prim with the same name)
|
/// 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)
|
if (ent is SceneObjectGroup)
|
||||||
{
|
{
|
||||||
foreach(SceneObjectPart p in ((SceneObjectGroup) ent).GetParts())
|
foreach (SceneObjectPart p in ((SceneObjectGroup) ent).GetParts())
|
||||||
{
|
{
|
||||||
if (p.Name==name)
|
if (p.Name==name)
|
||||||
{
|
{
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -2292,7 +2292,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient)
|
public void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient)
|
||||||
{
|
{
|
||||||
SceneObjectPart part = GetSceneObjectPart(itemID);
|
SceneObjectPart part = GetSceneObjectPart(itemID);
|
||||||
if(part == null || part.ParentGroup == null)
|
if (part == null || part.ParentGroup == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
UUID inventoryID = part.ParentGroup.GetFromAssetID();
|
UUID inventoryID = part.ParentGroup.GetFromAssetID();
|
||||||
|
@ -2300,7 +2300,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
ScenePresence presence;
|
ScenePresence presence;
|
||||||
if (TryGetAvatar(remoteClient.AgentId, out 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;
|
return;
|
||||||
|
|
||||||
presence.Appearance.DetachAttachment(itemID);
|
presence.Appearance.DetachAttachment(itemID);
|
||||||
|
|
|
@ -3896,7 +3896,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
// }
|
// }
|
||||||
// }
|
// }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get a named prim contained in this scene (will return the first
|
/// Get a named prim contained in this scene (will return the first
|
||||||
/// found, if there are more than one prim with the same name)
|
/// found, if there are more than one prim with the same name)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -2759,7 +2759,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public void SetAttachmentPoint(byte point)
|
public void SetAttachmentPoint(byte point)
|
||||||
{
|
{
|
||||||
lock(m_parts)
|
lock (m_parts)
|
||||||
{
|
{
|
||||||
foreach (SceneObjectPart part in m_parts.Values)
|
foreach (SceneObjectPart part in m_parts.Values)
|
||||||
part.SetAttachmentPoint(point);
|
part.SetAttachmentPoint(point);
|
||||||
|
|
|
@ -202,9 +202,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
if (lastScriptEngine != null)
|
if (lastScriptEngine != null)
|
||||||
lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown",ScriptEngineName,e.GetType().ToString());
|
lastScriptEngine.Log.WarnFormat("[{0}]: Exception {1} thrown", ScriptEngineName, e.GetType().ToString());
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -216,7 +216,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
|
||||||
public void DoProcessQueue()
|
public void DoProcessQueue()
|
||||||
{
|
{
|
||||||
foreach (ScriptEngine m_ScriptEngine in
|
foreach (ScriptEngine m_ScriptEngine in
|
||||||
new ArrayList(ScriptEngine.ScriptEngines))
|
new ArrayList(ScriptEngine.ScriptEngines))
|
||||||
{
|
{
|
||||||
lastScriptEngine = m_ScriptEngine;
|
lastScriptEngine = m_ScriptEngine;
|
||||||
|
|
||||||
|
@ -290,21 +290,21 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
|
||||||
InExecution = false;
|
InExecution = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (SelfDeleteException sde)
|
catch (SelfDeleteException sde)
|
||||||
{
|
{
|
||||||
// Make sure this exception isn't consumed here... we need it
|
// Make sure this exception isn't consumed here... we need it
|
||||||
throw sde;
|
throw sde;
|
||||||
}
|
}
|
||||||
catch (TargetInvocationException tie)
|
catch (TargetInvocationException tie)
|
||||||
{
|
{
|
||||||
// Probably don't need to special case this one
|
// Probably don't need to special case this one
|
||||||
throw tie;
|
throw tie;
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
InExecution = false;
|
InExecution = false;
|
||||||
string text = FormatException(e, QIS.LineMap);
|
string text = FormatException(e, QIS.LineMap);
|
||||||
|
|
||||||
// DISPLAY ERROR INWORLD
|
// DISPLAY ERROR INWORLD
|
||||||
|
|
||||||
// if (e.InnerException != null)
|
// if (e.InnerException != null)
|
||||||
|
@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
|
||||||
catch (Exception)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
m_ScriptEngine.m_EventQueueManager.
|
m_ScriptEngine.m_EventQueueManager.
|
||||||
m_ScriptEngine.Log.Error("[" +
|
m_ScriptEngine.Log.Error("[" +
|
||||||
ScriptEngineName + "]: " +
|
ScriptEngineName + "]: " +
|
||||||
"Unable to send text in-world:\r\n" +
|
"Unable to send text in-world:\r\n" +
|
||||||
text);
|
text);
|
||||||
|
|
|
@ -4699,7 +4699,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
if (cindex > 0)
|
if (cindex > 0)
|
||||||
{
|
{
|
||||||
ret.Add(str.Substring(0, cindex));
|
ret.Add(str.Substring(0, cindex));
|
||||||
}
|
}
|
||||||
// Cannot use spacers.Contains() because spacers may be either type String or LSLString
|
// Cannot use spacers.Contains() because spacers may be either type String or LSLString
|
||||||
for (int j = 0; j < spacers.Length; j++)
|
for (int j = 0; j < spacers.Length; j++)
|
||||||
{
|
{
|
||||||
|
|
|
@ -710,18 +710,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
return String.Empty;
|
return String.Empty;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public string osGetSimulatorVersion()
|
public string osGetSimulatorVersion()
|
||||||
{
|
{
|
||||||
// High because it can be used to target attacks to known weaknesses
|
// 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
|
// This would allow a new class of griefer scripts that don't even
|
||||||
// require their user to know what they are doing (see script
|
// require their user to know what they are doing (see script
|
||||||
// kiddie)
|
// kiddie)
|
||||||
//
|
//
|
||||||
CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
|
CheckThreatLevel(ThreatLevel.High,"osGetSimulatorVersion");
|
||||||
m_host.AddScriptLPS(1);
|
m_host.AddScriptLPS(1);
|
||||||
return m_ScriptEngine.World.GetSimulatorVersion();
|
return m_ScriptEngine.World.GetSimulatorVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//for testing purposes only
|
//for testing purposes only
|
||||||
|
|
|
@ -85,7 +85,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
||||||
void osSetRegionWaterHeight(double height);
|
void osSetRegionWaterHeight(double height);
|
||||||
|
|
||||||
string osGetScriptEngineName();
|
string osGetScriptEngineName();
|
||||||
string osGetSimulatorVersion();
|
string osGetSimulatorVersion();
|
||||||
void osSetParcelMediaTime(double time);
|
void osSetParcelMediaTime(double time);
|
||||||
Hashtable osParseJSON(string JSON);
|
Hashtable osParseJSON(string JSON);
|
||||||
|
|
||||||
|
|
|
@ -191,19 +191,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
//Console.WriteLine("ScriptEngine: Executing function name: " + EventName);
|
//Console.WriteLine("ScriptEngine: Executing function name: " + EventName);
|
||||||
#endif
|
#endif
|
||||||
// Found
|
// Found
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
ev.Invoke(m_Script, args);
|
ev.Invoke(m_Script, args);
|
||||||
}
|
}
|
||||||
catch (TargetInvocationException tie)
|
catch (TargetInvocationException tie)
|
||||||
{
|
{
|
||||||
// Grab the inner exception and rethrow it
|
// Grab the inner exception and rethrow it
|
||||||
throw tie.InnerException;
|
throw tie.InnerException;
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void initEventFlags()
|
protected void initEventFlags()
|
||||||
|
|
|
@ -214,11 +214,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
{
|
{
|
||||||
return m_OSSL_Functions.osGetScriptEngineName();
|
return m_OSSL_Functions.osGetScriptEngineName();
|
||||||
}
|
}
|
||||||
|
|
||||||
public string osGetSimulatorVersion()
|
public string osGetSimulatorVersion()
|
||||||
{
|
{
|
||||||
return m_OSSL_Functions.osGetSimulatorVersion();
|
return m_OSSL_Functions.osGetSimulatorVersion();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//for testing purposes only
|
//for testing purposes only
|
||||||
|
|
Loading…
Reference in New Issue