ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update svn properties, formatting cleanup.

Browse Source
This commit is contained in:
Jeff Ames
2008-09-09 01:26:48 +00:00
parent 3e1441afe1
commit fae34bb10c
41 changed files with 838 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Environment/Scenes/EntityList.cs
View File

@@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes
// FindObject(UUID)
// FindObject(int)
// FindPresence(UUID)
public void Add(SceneObjectGroup obj)
{
m_obj_by_uuid[obj.UUID] = obj;
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes
public SceneObjectGroup RemoveObject(UUID uuid)
{
SceneObjectGroup sog = null;
try
try
{
sog = (SceneObjectGroup)m_obj_by_uuid[uuid];
m_obj_by_uuid.Remove(uuid);
@@ -99,11 +99,11 @@ namespace OpenSim.Region.Environment.Scenes
}
return sog;
}
public ScenePresence RemovePresence(UUID uuid)
{
ScenePresence sp = null;
try
try
{
sp = (ScenePresence)m_pres_by_uuid[uuid];
m_pres_by_uuid.Remove(uuid);
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Environment.Scenes
m_log.ErrorFormat("RemovePresence failed for {0}", uuid, e);
sp = null;
}
return sp;
return sp;
}
public SceneObjectGroup FindObject(UUID uuid)
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Scenes
public SceneObjectGroup FindObject(int local)
{
try
try
{
UUID uuid = (UUID)m_obj_by_local[local];
SceneObjectGroup sog = (SceneObjectGroup)m_obj_by_uuid[uuid];

4
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Scenes
List<EntityBase> updateEntities = GetEntities();
foreach (EntityBase entity in updateEntities)
{
{
entity.Update();
}
}
@@ -325,7 +325,7 @@ namespace OpenSim.Region.Environment.Scenes
// Don't abort the whole update if one entity happens to give us an exception.
try
{
m_updateList[i].Update();
m_updateList[i].Update();
}
catch (Exception e)
{

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

@@ -1581,7 +1581,7 @@ namespace OpenSim.Region.Environment.Scenes
/// Schedule a terse update for this scene object
/// </summary>
public void ScheduleGroupForTerseUpdate()
{
{
lock (m_parts)
{
foreach (SceneObjectPart part in m_parts.Values)

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

@@ -1321,7 +1321,7 @@ namespace OpenSim.Region.Environment.Scenes
public static SceneObjectPart FromXml(XmlReader xmlReader)
{
// It's not necessary to persist this
XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart));
SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader);
return newobject;