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

Formatting cleanup.

0.6.0-stable
Jeff Ames 2008-05-12 01:23:03 +00:00
parent 71f074839c
commit 2382342c65
6 changed files with 66 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -616,7 +616,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
public void MakeChildAgent()
{
if(m_animations.Count > 0)
if (m_animations.Count > 0)
{
LLUUID movement=m_animations[0];
@ -1110,11 +1110,11 @@ namespace OpenSim.Region.Environment.Scenes
public void AddAnimation(LLUUID animID)
{
if(m_isChildAgent)
if (m_isChildAgent)
return;
// Don't let this animation become the movement animation
if(m_animations.Count < 1)
if (m_animations.Count < 1)
SetMovementAnimation(Animations.AnimsLLUUID["STAND"]);
if (!m_animations.Contains(animID))
@ -1127,7 +1127,7 @@ namespace OpenSim.Region.Environment.Scenes
public void RemoveAnimation(LLUUID animID)
{
if(m_isChildAgent)
if (m_isChildAgent)
return;
if (m_animations.Contains(animID))
@ -1143,7 +1143,7 @@ namespace OpenSim.Region.Environment.Scenes
for(idx=0;idx < m_animations.Count;idx++)
{
if(m_animations[idx] == animID)
if (m_animations[idx] == animID)
{
int seq=m_animationSeqs[idx];
@ -1158,15 +1158,15 @@ namespace OpenSim.Region.Environment.Scenes
}
public void AddAnimation(string name)
{
if(m_isChildAgent)
if (m_isChildAgent)
return;
// Don't let this animation become the movement animation
if(m_animations.Count < 1)
if (m_animations.Count < 1)
SetMovementAnimation(Animations.AnimsLLUUID["STAND"]);
LLUUID animID=m_controllingClient.GetDefaultAnimation(name);
if(animID == LLUUID.Zero)
if (animID == LLUUID.Zero)
return;
if (!m_animations.Contains(animID))
@ -1179,11 +1179,11 @@ namespace OpenSim.Region.Environment.Scenes
public void RemoveAnimation(string name)
{
if(m_isChildAgent)
if (m_isChildAgent)
return;
LLUUID animID=m_controllingClient.GetDefaultAnimation(name);
if(animID == LLUUID.Zero)
if (animID == LLUUID.Zero)
return;
if (m_animations.Contains(animID))
@ -1199,7 +1199,7 @@ namespace OpenSim.Region.Environment.Scenes
for(idx=0;idx < m_animations.Count;idx++)
{
if(m_animations[idx] == animID)
if (m_animations[idx] == animID)
{
int seq=m_animationSeqs[idx];
@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary>
protected void SetMovementAnimation(LLUUID anim)
{
if(m_animations.Count < 1)
if (m_animations.Count < 1)
{
m_animations.Add(Animations.AnimsLLUUID["STAND"]);
m_animationSeqs.Add(1);
@ -1649,7 +1649,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="seqs"></param>
public void SendAnimPack(LLUUID[] animations, int[] seqs)
{
if(m_isChildAgent)
if (m_isChildAgent)
return;
m_scene.Broadcast(

43
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -532,8 +532,6 @@ namespace OpenSim.Region.ScriptEngine.Common
LLUUID.TryParse(id, out keyID);
m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SenseOnce(m_localID, m_itemID, name, keyID, type, range, arc, m_host);
return;
}
public void llSensorRepeat(string name, string id, int type, double range, double arc, double rate)
@ -543,14 +541,12 @@ namespace OpenSim.Region.ScriptEngine.Common
LLUUID.TryParse(id, out keyID);
m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.SetSenseRepeatEvent(m_localID, m_itemID, name, keyID, type, range, arc, rate, m_host);
return;
}
public void llSensorRemove()
{
m_host.AddScriptLPS(1);
m_ScriptEngine.m_ASYNCLSLCommandManager.m_SensorRepeat.UnSetSenseRepeaterEvents(m_localID, m_itemID);
return;
}
public string resolveName(LLUUID objecUUID)
@ -762,7 +758,6 @@ namespace OpenSim.Region.ScriptEngine.Common
{
m_host.AddScriptLPS(1);
World.DeleteSceneObjectGroup(m_host.ParentGroup);
return;
}
public double llGround(LSL_Types.Vector3 offset)
@ -849,7 +844,6 @@ namespace OpenSim.Region.ScriptEngine.Common
m_host.SetAxisRotation(statusrotationaxis, value);
}
return;
}
public LSL_Types.LSLInteger llGetStatus(int status)
@ -921,7 +915,6 @@ namespace OpenSim.Region.ScriptEngine.Common
tmp.Z = (float)scale.z;
part.Scale = tmp;
part.SendFullUpdateToAllClients();
return;
}
public LSL_Types.Vector3 llGetScale()
@ -2547,7 +2540,6 @@ namespace OpenSim.Region.ScriptEngine.Common
public void llSetScriptState(string name, int run)
{
LLUUID item;
ScriptManager sm;
IScript script = null;
@ -2576,11 +2568,8 @@ namespace OpenSim.Region.ScriptEngine.Common
if (script == null)
ShoutError("llSetScriptState: script "+name+" not found");
// If we didn;t find it, then it's safe to
// If we didn't find it, then it's safe to
// assume it is not running.
return;
}
public double llGetEnergy()
@ -4363,7 +4352,6 @@ namespace OpenSim.Region.ScriptEngine.Common
public void llResetOtherScript(string name)
{
LLUUID item;
ScriptManager sm;
IScript script = null;
@ -4382,16 +4370,12 @@ namespace OpenSim.Region.ScriptEngine.Common
if (script == null)
ShoutError("llResetOtherScript: script "+name+" not found");
// If we didn;t find it, then it's safe to
// If we didn't find it, then it's safe to
// assume it is not running.
return;
}
public LSL_Types.LSLInteger llGetScriptState(string name)
{
LLUUID item;
ScriptManager sm;
IScript script = null;
@ -4417,11 +4401,10 @@ namespace OpenSim.Region.ScriptEngine.Common
if (script == null)
ShoutError("llGetScriptState: script "+name+" not found");
// If we didn;t find it, then it's safe to
// If we didn't find it, then it's safe to
// assume it is not running.
return 0;
}
public void llRemoteLoadScript()
@ -4503,27 +4486,26 @@ namespace OpenSim.Region.ScriptEngine.Common
{
if ((partInst.LinkNum + 1) == linknumber)
{
part=partInst;
part = partInst;
break;
}
}
}
else
{
part=m_host;
part = m_host;
}
if (part == null)
return;
int idx = 0;
int idx=0;
while(idx < rules.Length)
while (idx < rules.Length)
{
int code=Convert.ToInt32(rules.Data[idx++]);
int code = Convert.ToInt32(rules.Data[idx++]);
int remain=rules.Length-idx;
int remain = rules.Length - idx;
int face;
LSL_Types.Vector3 v;
@ -4586,7 +4568,6 @@ namespace OpenSim.Region.ScriptEngine.Common
SetScale(part, v);
break;
}
}
}
@ -5141,7 +5122,6 @@ namespace OpenSim.Region.ScriptEngine.Common
public string llIntegerToBase64(int number)
{
// uninitialized string
char[] imdt = new char[8];
@ -5160,7 +5140,6 @@ namespace OpenSim.Region.ScriptEngine.Common
imdt[0] = i2ctable[number>>26 & 0x3F];
return new string(imdt);
}
// <summary>
@ -5206,7 +5185,6 @@ namespace OpenSim.Region.ScriptEngine.Common
public LSL_Types.LSLInteger llBase64ToInteger(string str)
{
int number = 0;
int digit;
@ -5263,7 +5241,6 @@ namespace OpenSim.Region.ScriptEngine.Common
// ignore trailing padding
return number;
}
public double llGetGMTclock()
@ -5334,7 +5311,6 @@ namespace OpenSim.Region.ScriptEngine.Common
public LSL_Types.list llParseStringKeepNulls(string src, LSL_Types.list separators, LSL_Types.list spacers)
{
int beginning = 0;
int srclen = src.Length;
int seplen = separators.Length;
@ -5456,7 +5432,6 @@ namespace OpenSim.Region.ScriptEngine.Common
}
return tokens;
}
public void llRezAtRoot(string inventory, LSL_Types.Vector3 position, LSL_Types.Vector3 velocity,