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-08-17 23:07:14 +00:00
parent 35dde94f01
commit 531f6c01eb
5 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Cache.cs
View File

@ -495,7 +495,7 @@ namespace Opensim.Framework
public void Invalidate(LLUUID uuid)
{
if(!m_Lookup.ContainsKey(uuid))
if (!m_Lookup.ContainsKey(uuid))
return;
CacheItemBase item = m_Lookup[uuid];

2
OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory
public void Initialise(Scene scene, IConfigSource config)
{
if(!m_Scenelist.Contains(scene))
if (!m_Scenelist.Contains(scene))
{
m_Scenelist.Add(scene);

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

@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes
public void DeselectPrim(uint primLocalID, IClientAPI remoteClient)
{
SceneObjectPart part = GetSceneObjectPart(primLocalID);
if(part == null)
if (part == null)
return;
bool isAttachment = false;
@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes
//
if (part.ParentGroup == null)
{
if(part.IsAttachment)
if (part.IsAttachment)
isAttachment = true;
else
part.ScheduleFullUpdate();

6
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1177,7 +1177,7 @@ namespace OpenSim.Region.Environment.Scenes
public void ClearUndoState()
{
lock(m_undo)
lock (m_undo)
{
m_undo.Clear();
}
@ -2449,7 +2449,7 @@ namespace OpenSim.Region.Environment.Scenes
{
if (m_parentGroup != null)
{
lock(m_undo)
lock (m_undo)
{
if (m_undo.Count > 0)
{
@ -2958,7 +2958,7 @@ namespace OpenSim.Region.Environment.Scenes
public void Undo()
{
lock(m_undo)
lock (m_undo)
{
if (m_undo.Count > 0)
{

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

@ -5536,48 +5536,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
SetFullBright(part, face , st);
break;
case (int)ScriptBaseClass.PRIM_MATERIAL:
if (remain < 1)
return;
if (part != null)
{
/* Unhandled at this time - sends "Unhandled" message
will enable when available
byte material = (byte)Convert.ToByte( rules.Data[idx++]);
part.Material = material;
*/
return;
}
break;
case (int)ScriptBaseClass.PRIM_PHANTOM:
if (remain < 1)
return;
case (int)ScriptBaseClass.PRIM_MATERIAL:
if (remain < 1)
return;
if (part != null)
{
/* Unhandled at this time - sends "Unhandled" message
will enable when available
byte material = (byte)Convert.ToByte( rules.Data[idx++]);
part.Material = material;
*/
return;
}
break;
case (int)ScriptBaseClass.PRIM_PHANTOM:
if (remain < 1)
return;
string ph = rules.Data[idx++].ToString();
bool phantom;
string ph = rules.Data[idx++].ToString();
bool phantom;
if(ph.Equals("1"))
phantom = true;
else
phantom = false;
if (ph.Equals("1"))
phantom = true;
else
phantom = false;
part.ScriptSetPhantomStatus(phantom);
part.ScheduleFullUpdate();
break;
case (int)ScriptBaseClass.PRIM_PHYSICS:
if (remain < 1)
return;
string phy = rules.Data[idx++].ToString();
bool physics;
part.ScriptSetPhantomStatus(phantom);
part.ScheduleFullUpdate();
break;
case (int)ScriptBaseClass.PRIM_PHYSICS:
if (remain < 1)
return;
string phy = rules.Data[idx++].ToString();
bool physics;
if(phy.Equals("1"))
physics = true;
else
physics = false;
if (phy.Equals("1"))
physics = true;
else
physics = false;
m_host.ScriptSetPhysicsStatus(physics);
part.ScheduleFullUpdate();
break;
m_host.ScriptSetPhysicsStatus(physics);
part.ScheduleFullUpdate();
break;
}
}
}