diff options
author | Jeff Ames | 2008-08-19 02:59:27 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-19 02:59:27 +0000 |
commit | bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca (patch) | |
tree | 6350036021802eadb2540d14461eb545afd7dea6 /OpenSim/Framework | |
parent | Attachment persistence!!! Patch #9169 (Mantis #1171) (diff) | |
download | opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.zip opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.gz opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.bz2 opensim-SC-bea7d4d81ad7a75706305be6c8ca06f8dc6e6eca.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Console/ConsoleBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 67e26b1..3459504 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -363,7 +363,7 @@ namespace OpenSim.Framework | |||
363 | h["skirt_asset"] = SkirtAsset.ToString(); | 363 | h["skirt_asset"] = SkirtAsset.ToString(); |
364 | 364 | ||
365 | string attachments = GetAttachmentsString(); | 365 | string attachments = GetAttachmentsString(); |
366 | if(attachments != String.Empty) | 366 | if (attachments != String.Empty) |
367 | h["attachments"] = attachments; | 367 | h["attachments"] = attachments; |
368 | 368 | ||
369 | return h; | 369 | return h; |
@@ -411,7 +411,7 @@ namespace OpenSim.Framework | |||
411 | SkirtItem = new LLUUID((string)h["skirt_item"]); | 411 | SkirtItem = new LLUUID((string)h["skirt_item"]); |
412 | SkirtAsset = new LLUUID((string)h["skirt_asset"]); | 412 | SkirtAsset = new LLUUID((string)h["skirt_asset"]); |
413 | 413 | ||
414 | if(h.ContainsKey("attachments")) | 414 | if (h.ContainsKey("attachments")) |
415 | { | 415 | { |
416 | SetAttachmentsString(h["attachments"].ToString()); | 416 | SetAttachmentsString(h["attachments"].ToString()); |
417 | } | 417 | } |
@@ -441,7 +441,7 @@ namespace OpenSim.Framework | |||
441 | { | 441 | { |
442 | m_attachments.Clear(); | 442 | m_attachments.Clear(); |
443 | 443 | ||
444 | if(data == null) | 444 | if (data == null) |
445 | return; | 445 | return; |
446 | 446 | ||
447 | foreach (DictionaryEntry e in data) | 447 | foreach (DictionaryEntry e in data) |
@@ -468,7 +468,7 @@ namespace OpenSim.Framework | |||
468 | 468 | ||
469 | public Hashtable GetAttachments() | 469 | public Hashtable GetAttachments() |
470 | { | 470 | { |
471 | if(m_attachments.Count == 0) | 471 | if (m_attachments.Count == 0) |
472 | return null; | 472 | return null; |
473 | 473 | ||
474 | Hashtable ret = new Hashtable(); | 474 | Hashtable ret = new Hashtable(); |
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs index b9610e0..767740b 100644 --- a/OpenSim/Framework/Console/ConsoleBase.cs +++ b/OpenSim/Framework/Console/ConsoleBase.cs | |||
@@ -245,7 +245,7 @@ namespace OpenSim.Framework.Console | |||
245 | try | 245 | try |
246 | { | 246 | { |
247 | string line = System.Console.ReadLine(); | 247 | string line = System.Console.ReadLine(); |
248 | 248 | ||
249 | while (line == null) | 249 | while (line == null) |
250 | { | 250 | { |
251 | line = System.Console.ReadLine(); | 251 | line = System.Console.ReadLine(); |
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index abc2bc1..29ee143 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -255,8 +255,8 @@ namespace OpenSim.Framework.Servers | |||
255 | 255 | ||
256 | SetConsoleLogLevel(setParams); | 256 | SetConsoleLogLevel(setParams); |
257 | } | 257 | } |
258 | } | 258 | } |
259 | 259 | ||
260 | /// <summary> | 260 | /// <summary> |
261 | /// Show help information | 261 | /// Show help information |
262 | /// </summary> | 262 | /// </summary> |
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Servers | |||
270 | //Notice("help [command] - display general help or specific command help. Try help help for more info."); | 270 | //Notice("help [command] - display general help or specific command help. Try help help for more info."); |
271 | Notice("quit - equivalent to shutdown."); | 271 | Notice("quit - equivalent to shutdown."); |
272 | 272 | ||
273 | Notice("set log level [level] - change the console logging level only. For example, off or debug."); | 273 | Notice("set log level [level] - change the console logging level only. For example, off or debug."); |
274 | Notice("show info - show server information (e.g. startup path)."); | 274 | Notice("show info - show server information (e.g. startup path)."); |
275 | 275 | ||
276 | if (m_stats != null) | 276 | if (m_stats != null) |
@@ -280,7 +280,7 @@ namespace OpenSim.Framework.Servers | |||
280 | Notice("show uptime - show server startup time and uptime."); | 280 | Notice("show uptime - show server startup time and uptime."); |
281 | Notice("show version - show server version."); | 281 | Notice("show version - show server version."); |
282 | Notice("shutdown - shutdown the server.\n"); | 282 | Notice("shutdown - shutdown the server.\n"); |
283 | 283 | ||
284 | return; | 284 | return; |
285 | } | 285 | } |
286 | } | 286 | } |