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

De-tabify source.

0.6.0-stable
Jeff Ames 2008-05-06 22:41:38 +00:00
parent 0b09966c7e
commit 0ea48cf786
9 changed files with 533 additions and 527 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Data/MSSQL/MSSQLInventoryData.cs
View File

@ -198,7 +198,6 @@ namespace OpenSim.Data.MSSQL
while (reader.Read()) while (reader.Read())
items.Add(readInventoryFolder(reader)); items.Add(readInventoryFolder(reader));
reader.Close(); reader.Close();
result.Dispose(); result.Dispose();

3
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -186,8 +186,6 @@ namespace OpenSim.Region.Environment.Scenes
string.Format("[SCENE OBJECT GROUP]: Object {0} has no root part.", m_uuid)); string.Format("[SCENE OBJECT GROUP]: Object {0} has no root part.", m_uuid));
} }
return m_rootPart.GroupPosition; return m_rootPart.GroupPosition;
} }
set set
@ -198,7 +196,6 @@ namespace OpenSim.Region.Environment.Scenes
m_scene.CrossPrimGroupIntoNewRegion(val, this); m_scene.CrossPrimGroupIntoNewRegion(val, this);
} }
lock (m_parts) lock (m_parts)
{ {
foreach (SceneObjectPart part in m_parts.Values) foreach (SceneObjectPart part in m_parts.Values)

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

@ -2719,7 +2719,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
public void PhysicsCollision(EventArgs e) public void PhysicsCollision(EventArgs e)
{ {
return; return;
// //
@ -2733,7 +2732,6 @@ namespace OpenSim.Region.Environment.Scenes
//{ //{
// m_log.Debug("[OBJECT]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString()); // m_log.Debug("[OBJECT]: Collided with:" + localid.ToString() + " at depth of: " + collissionswith[localid].ToString());
//} //}
} }
public void SetDieAtEdge(bool p) public void SetDieAtEdge(bool p)
@ -2755,5 +2753,4 @@ namespace OpenSim.Region.Environment.Scenes
return m_parentGroup.RootPart.DIE_AT_EDGE; return m_parentGroup.RootPart.DIE_AT_EDGE;
} }
} }
} }

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

@ -2542,11 +2542,18 @@ namespace OpenSim.Region.ScriptEngine.Common
// so get the state one step at a time. // so get the state one step at a time.
if ((item = ScriptByName(name)) != LLUUID.Zero) if ((item = ScriptByName(name)) != LLUUID.Zero)
{
if ((sm = m_ScriptEngine.m_ScriptManager) != null) if ((sm = m_ScriptEngine.m_ScriptManager) != null)
{
if (sm.Scripts.ContainsKey(m_localID)) if (sm.Scripts.ContainsKey(m_localID))
{
if ((script = sm.GetScript(m_localID, item)) != null) if ((script = sm.GetScript(m_localID, item)) != null)
{
script.Exec.Running = (run==0) ? false : true; script.Exec.Running = (run==0) ? false : true;
}
}
}
}
// Required by SL // Required by SL
@ -4367,9 +4374,15 @@ namespace OpenSim.Region.ScriptEngine.Common
// so get the state one step at a time. // so get the state one step at a time.
if ((item = ScriptByName(name)) != LLUUID.Zero) if ((item = ScriptByName(name)) != LLUUID.Zero)
{
if ((sm = m_ScriptEngine.m_ScriptManager) != null) if ((sm = m_ScriptEngine.m_ScriptManager) != null)
{
if ((script = sm.GetScript(m_localID, item)) != null) if ((script = sm.GetScript(m_localID, item)) != null)
{
return script.Exec.Running?1:0; return script.Exec.Running?1:0;
}
}
}
// Required by SL // Required by SL