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) public void Invalidate(LLUUID uuid)
{ {
if(!m_Lookup.ContainsKey(uuid)) if (!m_Lookup.ContainsKey(uuid))
return; return;
CacheItemBase item = m_Lookup[uuid]; 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) public void Initialise(Scene scene, IConfigSource config)
{ {
if(!m_Scenelist.Contains(scene)) if (!m_Scenelist.Contains(scene))
{ {
m_Scenelist.Add(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) public void DeselectPrim(uint primLocalID, IClientAPI remoteClient)
{ {
SceneObjectPart part = GetSceneObjectPart(primLocalID); SceneObjectPart part = GetSceneObjectPart(primLocalID);
if(part == null) if (part == null)
return; return;
bool isAttachment = false; bool isAttachment = false;
@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes
// //
if (part.ParentGroup == null) if (part.ParentGroup == null)
{ {
if(part.IsAttachment) if (part.IsAttachment)
isAttachment = true; isAttachment = true;
else else
part.ScheduleFullUpdate(); part.ScheduleFullUpdate();

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

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

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