diff options
author | Jeff Ames | 2008-09-09 01:26:48 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-09 01:26:48 +0000 |
commit | fae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch) | |
tree | 2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/Environment/Scenes | |
parent | Fix state xxx within state xxx itself triggering a state "change" to (diff) | |
download | opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2 opensim-SC_OLD-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
4 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EntityList.cs b/OpenSim/Region/Environment/Scenes/EntityList.cs index 09eb84f..cd59f2a 100644 --- a/OpenSim/Region/Environment/Scenes/EntityList.cs +++ b/OpenSim/Region/Environment/Scenes/EntityList.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
71 | // FindObject(UUID) | 71 | // FindObject(UUID) |
72 | // FindObject(int) | 72 | // FindObject(int) |
73 | // FindPresence(UUID) | 73 | // FindPresence(UUID) |
74 | 74 | ||
75 | public void Add(SceneObjectGroup obj) | 75 | public void Add(SceneObjectGroup obj) |
76 | { | 76 | { |
77 | m_obj_by_uuid[obj.UUID] = obj; | 77 | m_obj_by_uuid[obj.UUID] = obj; |
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
86 | public SceneObjectGroup RemoveObject(UUID uuid) | 86 | public SceneObjectGroup RemoveObject(UUID uuid) |
87 | { | 87 | { |
88 | SceneObjectGroup sog = null; | 88 | SceneObjectGroup sog = null; |
89 | try | 89 | try |
90 | { | 90 | { |
91 | sog = (SceneObjectGroup)m_obj_by_uuid[uuid]; | 91 | sog = (SceneObjectGroup)m_obj_by_uuid[uuid]; |
92 | m_obj_by_uuid.Remove(uuid); | 92 | m_obj_by_uuid.Remove(uuid); |
@@ -99,11 +99,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
99 | } | 99 | } |
100 | return sog; | 100 | return sog; |
101 | } | 101 | } |
102 | 102 | ||
103 | public ScenePresence RemovePresence(UUID uuid) | 103 | public ScenePresence RemovePresence(UUID uuid) |
104 | { | 104 | { |
105 | ScenePresence sp = null; | 105 | ScenePresence sp = null; |
106 | try | 106 | try |
107 | { | 107 | { |
108 | sp = (ScenePresence)m_pres_by_uuid[uuid]; | 108 | sp = (ScenePresence)m_pres_by_uuid[uuid]; |
109 | m_pres_by_uuid.Remove(uuid); | 109 | m_pres_by_uuid.Remove(uuid); |
@@ -113,7 +113,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
113 | m_log.ErrorFormat("RemovePresence failed for {0}", uuid, e); | 113 | m_log.ErrorFormat("RemovePresence failed for {0}", uuid, e); |
114 | sp = null; | 114 | sp = null; |
115 | } | 115 | } |
116 | return sp; | 116 | return sp; |
117 | } | 117 | } |
118 | 118 | ||
119 | public SceneObjectGroup FindObject(UUID uuid) | 119 | public SceneObjectGroup FindObject(UUID uuid) |
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
132 | 132 | ||
133 | public SceneObjectGroup FindObject(int local) | 133 | public SceneObjectGroup FindObject(int local) |
134 | { | 134 | { |
135 | try | 135 | try |
136 | { | 136 | { |
137 | UUID uuid = (UUID)m_obj_by_local[local]; | 137 | UUID uuid = (UUID)m_obj_by_local[local]; |
138 | SceneObjectGroup sog = (SceneObjectGroup)m_obj_by_uuid[uuid]; | 138 | SceneObjectGroup sog = (SceneObjectGroup)m_obj_by_uuid[uuid]; |
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 53b0a38..bfe6832 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -140,7 +140,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
140 | List<EntityBase> updateEntities = GetEntities(); | 140 | List<EntityBase> updateEntities = GetEntities(); |
141 | 141 | ||
142 | foreach (EntityBase entity in updateEntities) | 142 | foreach (EntityBase entity in updateEntities) |
143 | { | 143 | { |
144 | entity.Update(); | 144 | entity.Update(); |
145 | } | 145 | } |
146 | } | 146 | } |
@@ -325,7 +325,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
325 | // Don't abort the whole update if one entity happens to give us an exception. | 325 | // Don't abort the whole update if one entity happens to give us an exception. |
326 | try | 326 | try |
327 | { | 327 | { |
328 | m_updateList[i].Update(); | 328 | m_updateList[i].Update(); |
329 | } | 329 | } |
330 | catch (Exception e) | 330 | catch (Exception e) |
331 | { | 331 | { |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 3c34f73..c049e86 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1581,7 +1581,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1581 | /// Schedule a terse update for this scene object | 1581 | /// Schedule a terse update for this scene object |
1582 | /// </summary> | 1582 | /// </summary> |
1583 | public void ScheduleGroupForTerseUpdate() | 1583 | public void ScheduleGroupForTerseUpdate() |
1584 | { | 1584 | { |
1585 | lock (m_parts) | 1585 | lock (m_parts) |
1586 | { | 1586 | { |
1587 | foreach (SceneObjectPart part in m_parts.Values) | 1587 | foreach (SceneObjectPart part in m_parts.Values) |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 17c5f04..352de27 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1321,7 +1321,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1321 | public static SceneObjectPart FromXml(XmlReader xmlReader) | 1321 | public static SceneObjectPart FromXml(XmlReader xmlReader) |
1322 | { | 1322 | { |
1323 | // It's not necessary to persist this | 1323 | // It's not necessary to persist this |
1324 | 1324 | ||
1325 | XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart)); | 1325 | XmlSerializer serializer = new XmlSerializer(typeof (SceneObjectPart)); |
1326 | SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader); | 1326 | SceneObjectPart newobject = (SceneObjectPart) serializer.Deserialize(xmlReader); |
1327 | return newobject; | 1327 | return newobject; |