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

renaming to be similar to equivalent Set command 

Conflicts:

	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
avinationmerge
Melanie 2012-08-25 18:19:51 +01:00
parent 007a45aa76
commit 1eb1c1bd4b
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3737,7 +3737,7 @@ namespace OpenSim.Region.Framework.Scenes
"[SCENE]: Existing root scene presence detected for {0} {1} in {2} when connecting. Removing existing presence.",
sp.Name, sp.UUID, RegionInfo.RegionName);
sp.ControllingClient.Close(true);
sp.ControllingClient.Close(true, true);
sp = null;
}

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

@ -8821,7 +8821,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_List llGetPrimitiveParams(LSL_List rules)
{
m_host.AddScriptLPS(1);
return GetLinkPrimitiveParams(m_host, rules);
return GetPrimParams(m_host, rules);
}
public LSL_List llGetLinkPrimitiveParams(int linknumber, LSL_List rules)
@ -8840,7 +8840,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
foreach (var part in parts)
{
LSL_List partRes = GetLinkPrimitiveParams(part, rules);
LSL_List partRes = GetPrimParams(part, rules);
res += partRes;
}
}
@ -8848,14 +8848,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
foreach (ScenePresence avatar in avatars)
{
LSL_List avaRes = GetLinkPrimitiveParams(avatar, rules);
LSL_List avaRes = GetPrimParams(avatar, rules);
res += avaRes;
}
}
return res;
}
public LSL_List GetLinkPrimitiveParams(ScenePresence avatar, LSL_List rules)
public LSL_List GetPrimParams(ScenePresence avatar, LSL_List rules)
{
// avatars case
// replies as SL wiki
@ -9116,7 +9116,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return res;
}
public LSL_List GetLinkPrimitiveParams(SceneObjectPart part, LSL_List rules)
public LSL_List GetPrimParams(SceneObjectPart part, LSL_List rules)
{
LSL_List res = new LSL_List();
int idx=0;
@ -12104,7 +12104,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
}
public LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules)
public LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules)
{
SceneObjectPart obj = World.GetSceneObjectPart(new UUID(prim));
if (obj == null)
@ -12113,7 +12113,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
if (obj.OwnerID != m_host.OwnerID)
return new LSL_List();
return GetLinkPrimitiveParams(obj, rules);
return GetPrimParams(obj, rules);
}
public LSL_Integer llGetLinkNumberOfSides(LSL_Integer link)

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

@ -2261,7 +2261,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
List<SceneObjectPart> parts = ((LSL_Api)m_LSL_Api).GetLinkParts(linknumber);
foreach (SceneObjectPart part in parts)
{
retVal += ((LSL_Api)m_LSL_Api).GetLinkPrimitiveParams(part, rules);
retVal += ((LSL_Api)m_LSL_Api).GetPrimParams(part, rules);
}
return retVal;
}
@ -3013,7 +3013,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.AddScriptLPS(1);
InitLSL();
return m_LSL_Api.GetLinkPrimitiveParamsEx(prim, rules);
return m_LSL_Api.GetPrimitiveParamsEx(prim, rules);
}
public void osSetPrimitiveParams(LSL_Key prim, LSL_List rules)

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

@ -430,7 +430,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
void llSetPhysicsMaterial(int material_bits, float material_gravity_modifier, float material_restitution, float material_friction, float material_density);
void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
LSL_List GetLinkPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
void llSetKeyframedMotion(LSL_List frames, LSL_List options);
LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
}
}