diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Framework/DAMap.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Framework/DAMap.cs')
-rw-r--r-- | OpenSim/Framework/DAMap.cs | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs index 4995a92..1915fa5 100644 --- a/OpenSim/Framework/DAMap.cs +++ b/OpenSim/Framework/DAMap.cs | |||
@@ -63,9 +63,9 @@ namespace OpenSim.Framework | |||
63 | { | 63 | { |
64 | get { return m_map; } | 64 | get { return m_map; } |
65 | set { m_map = value; } | 65 | set { m_map = value; } |
66 | } | 66 | } |
67 | 67 | ||
68 | public XmlSchema GetSchema() { return null; } | 68 | public XmlSchema GetSchema() { return null; } |
69 | 69 | ||
70 | public static DAMap FromXml(string rawXml) | 70 | public static DAMap FromXml(string rawXml) |
71 | { | 71 | { |
@@ -73,19 +73,19 @@ namespace OpenSim.Framework | |||
73 | map.ReadXml(rawXml); | 73 | map.ReadXml(rawXml); |
74 | return map; | 74 | return map; |
75 | } | 75 | } |
76 | 76 | ||
77 | public void ReadXml(XmlReader reader) | 77 | public void ReadXml(XmlReader reader) |
78 | { | 78 | { |
79 | ReadXml(reader.ReadInnerXml()); | 79 | ReadXml(reader.ReadInnerXml()); |
80 | } | 80 | } |
81 | 81 | ||
82 | public void ReadXml(string rawXml) | 82 | public void ReadXml(string rawXml) |
83 | { | 83 | { |
84 | // System.Console.WriteLine("Trying to deserialize [{0}]", rawXml); | 84 | // System.Console.WriteLine("Trying to deserialize [{0}]", rawXml); |
85 | 85 | ||
86 | lock (this) | 86 | lock (this) |
87 | { | 87 | { |
88 | m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml); | 88 | m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml); |
89 | SanitiseMap(this); | 89 | SanitiseMap(this); |
90 | } | 90 | } |
91 | } | 91 | } |
@@ -104,7 +104,7 @@ namespace OpenSim.Framework | |||
104 | public void CopyFrom(DAMap other) | 104 | public void CopyFrom(DAMap other) |
105 | { | 105 | { |
106 | // Deep copy | 106 | // Deep copy |
107 | 107 | ||
108 | string data = null; | 108 | string data = null; |
109 | lock (other) | 109 | lock (other) |
110 | { | 110 | { |
@@ -113,7 +113,7 @@ namespace OpenSim.Framework | |||
113 | data = OSDParser.SerializeLLSDXmlString(other.m_map); | 113 | data = OSDParser.SerializeLLSDXmlString(other.m_map); |
114 | } | 114 | } |
115 | } | 115 | } |
116 | 116 | ||
117 | lock (this) | 117 | lock (this) |
118 | { | 118 | { |
119 | if (data == null) | 119 | if (data == null) |
@@ -185,9 +185,9 @@ namespace OpenSim.Framework | |||
185 | /// <summary> | 185 | /// <summary> |
186 | /// Get the number of stores. | 186 | /// Get the number of stores. |
187 | /// </summary> | 187 | /// </summary> |
188 | public int CountStores | 188 | public int CountStores |
189 | { | 189 | { |
190 | get | 190 | get |
191 | { | 191 | { |
192 | int count = 0; | 192 | int count = 0; |
193 | 193 | ||
@@ -263,8 +263,8 @@ namespace OpenSim.Framework | |||
263 | throw new Exception("Minimum namespace length is " + MIN_NAMESPACE_LENGTH); | 263 | throw new Exception("Minimum namespace length is " + MIN_NAMESPACE_LENGTH); |
264 | } | 264 | } |
265 | 265 | ||
266 | public bool ContainsStore(string ns, string storeName) | 266 | public bool ContainsStore(string ns, string storeName) |
267 | { | 267 | { |
268 | OSD namespaceOsd; | 268 | OSD namespaceOsd; |
269 | 269 | ||
270 | lock (this) | 270 | lock (this) |
@@ -276,7 +276,7 @@ namespace OpenSim.Framework | |||
276 | } | 276 | } |
277 | 277 | ||
278 | return false; | 278 | return false; |
279 | } | 279 | } |
280 | 280 | ||
281 | public bool TryGetStore(string ns, string storeName, out OSDMap store) | 281 | public bool TryGetStore(string ns, string storeName, out OSDMap store) |
282 | { | 282 | { |
@@ -297,17 +297,17 @@ namespace OpenSim.Framework | |||
297 | 297 | ||
298 | store = null; | 298 | store = null; |
299 | return false; | 299 | return false; |
300 | } | 300 | } |
301 | 301 | ||
302 | public void Clear() | 302 | public void Clear() |
303 | { | 303 | { |
304 | lock (this) | 304 | lock (this) |
305 | m_map.Clear(); | 305 | m_map.Clear(); |
306 | } | 306 | } |
307 | 307 | ||
308 | public bool RemoveStore(string ns, string storeName) | 308 | public bool RemoveStore(string ns, string storeName) |
309 | { | 309 | { |
310 | OSD namespaceOsd; | 310 | OSD namespaceOsd; |
311 | 311 | ||
312 | lock (this) | 312 | lock (this) |
313 | { | 313 | { |
@@ -323,6 +323,6 @@ namespace OpenSim.Framework | |||
323 | } | 323 | } |
324 | 324 | ||
325 | return false; | 325 | return false; |
326 | } | 326 | } |
327 | } | 327 | } |
328 | } \ No newline at end of file | 328 | } \ No newline at end of file |