diff options
author | Jeff Ames | 2008-05-18 23:06:50 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-18 23:06:50 +0000 |
commit | 6ec680918bc6876f1c1382fb534b653fc34da052 (patch) | |
tree | 7eedbb3fa05b9540de9bba4a583795f1ba919de4 /OpenSim/Region/DataSnapshot | |
parent | Update svn properties. (diff) | |
download | opensim-SC_OLD-6ec680918bc6876f1c1382fb534b653fc34da052.zip opensim-SC_OLD-6ec680918bc6876f1c1382fb534b653fc34da052.tar.gz opensim-SC_OLD-6ec680918bc6876f1c1382fb534b653fc34da052.tar.bz2 opensim-SC_OLD-6ec680918bc6876f1c1382fb534b653fc34da052.tar.xz |
Formatting cleanup, minor refactoring. Fixed some comparisons of value types and null.
Diffstat (limited to 'OpenSim/Region/DataSnapshot')
-rw-r--r-- | OpenSim/Region/DataSnapshot/EstateSnapshot.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/LandSnapshot.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/SnapshotStore.cs | 1 |
5 files changed, 7 insertions, 10 deletions
diff --git a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs index 40b96d5..9a25c1d 100644 --- a/OpenSim/Region/DataSnapshot/EstateSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/EstateSnapshot.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
38 | /* This module doesn't check for changes, since it's *assumed* there are none. | 38 | /* This module doesn't check for changes, since it's *assumed* there are none. |
39 | * Nevertheless, it's possible to have changes, since all the fields are public. | 39 | * Nevertheless, it's possible to have changes, since all the fields are public. |
40 | * There's no event to subscribe to. :/ | 40 | * There's no event to subscribe to. :/ |
41 | * | 41 | * |
42 | * I don't think anything changes the fields beyond RegionModule PostInit, however. | 42 | * I don't think anything changes the fields beyond RegionModule PostInit, however. |
43 | */ | 43 | */ |
44 | private Scene m_scene = null; | 44 | private Scene m_scene = null; |
diff --git a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs index 209f804..e1d7ac3 100644 --- a/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs +++ b/OpenSim/Region/DataSnapshot/LLSDDiscovery.cs | |||
@@ -23,7 +23,6 @@ | |||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | ||
27 | */ | 26 | */ |
28 | 27 | ||
29 | using System; | 28 | using System; |
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 4bfa87a..02e80ba 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs | |||
@@ -23,7 +23,6 @@ | |||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | ||
27 | */ | 26 | */ |
28 | 27 | ||
29 | using System; | 28 | using System; |
@@ -53,9 +52,9 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
53 | 52 | ||
54 | /* | 53 | /* |
55 | * David, I don't think we need this at all. When we do the snapshot, we can | 54 | * David, I don't think we need this at all. When we do the snapshot, we can |
56 | * simply look into the parcels that are marked for ShowDirectory -- see | 55 | * simply look into the parcels that are marked for ShowDirectory -- see |
57 | * conditional in RequestSnapshotData | 56 | * conditional in RequestSnapshotData |
58 | * | 57 | * |
59 | //Revise this, look for more direct way of checking for change in land | 58 | //Revise this, look for more direct way of checking for change in land |
60 | #region Client hooks | 59 | #region Client hooks |
61 | 60 | ||
@@ -119,7 +118,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
119 | } | 118 | } |
120 | 119 | ||
121 | public XmlNode RequestSnapshotData(XmlDocument nodeFactory) | 120 | public XmlNode RequestSnapshotData(XmlDocument nodeFactory) |
122 | { | 121 | { |
123 | ILandChannel landChannel = (LandChannel)m_scene.LandChannel; | 122 | ILandChannel landChannel = (LandChannel)m_scene.LandChannel; |
124 | Dictionary<int, ILandObject> landList = null; | 123 | Dictionary<int, ILandObject> landList = null; |
125 | try | 124 | try |
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index af73ba0..e5b2ad4 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
79 | client.OnObjectPermissions += delegate(IClientAPI controller, LLUUID agentID, LLUUID sessionID, | 79 | client.OnObjectPermissions += delegate(IClientAPI controller, LLUUID agentID, LLUUID sessionID, |
80 | byte field, uint localId, uint mask, byte set) { this.Stale = true; }; | 80 | byte field, uint localId, uint mask, byte set) { this.Stale = true; }; |
81 | client.OnRezObject += delegate(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, | 81 | client.OnRezObject += delegate(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, |
82 | LLVector3 RayStart, LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 82 | LLVector3 RayStart, LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
83 | uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, | 83 | uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, bool RezSelected, |
84 | bool RemoveItem, LLUUID fromTaskID) { this.Stale = true; }; | 84 | bool RemoveItem, LLUUID fromTaskID) { this.Stale = true; }; |
85 | } | 85 | } |
@@ -99,7 +99,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
99 | foreach (EntityBase entity in m_scene.Entities.Values) | 99 | foreach (EntityBase entity in m_scene.Entities.Values) |
100 | { | 100 | { |
101 | // only objects, not avatars | 101 | // only objects, not avatars |
102 | if (entity is SceneObjectGroup) | 102 | if (entity is SceneObjectGroup) |
103 | { | 103 | { |
104 | SceneObjectGroup obj = (SceneObjectGroup)entity; | 104 | SceneObjectGroup obj = (SceneObjectGroup)entity; |
105 | 105 | ||
@@ -135,7 +135,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
135 | node = nodeFactory.CreateNode(XmlNodeType.Element, "description", ""); | 135 | node = nodeFactory.CreateNode(XmlNodeType.Element, "description", ""); |
136 | node.InnerText = m_rootPart.Description; | 136 | node.InnerText = m_rootPart.Description; |
137 | xmlobject.AppendChild(node); | 137 | xmlobject.AppendChild(node); |
138 | 138 | ||
139 | node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", ""); | 139 | node = nodeFactory.CreateNode(XmlNodeType.Element, "flags", ""); |
140 | node.InnerText = String.Format("{0:x}", m_rootPart.ObjectFlags); | 140 | node.InnerText = String.Format("{0:x}", m_rootPart.ObjectFlags); |
141 | xmlobject.AppendChild(node); | 141 | xmlobject.AppendChild(node); |
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs index 7e2c060..4f4beea 100644 --- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs +++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs | |||
@@ -23,7 +23,6 @@ | |||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | ||
27 | */ | 26 | */ |
28 | 27 | ||
29 | using System; | 28 | using System; |