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;
|
||||||
|
|
|
@ -872,7 +872,7 @@ 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)
|
||||||
{
|
{
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -203,7 +203,7 @@ 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue