diff options
author | Teravus Ovares | 2008-03-31 23:54:49 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-03-31 23:54:49 +0000 |
commit | a0a0229fdfc980b1a716e94c33812937431671e6 (patch) | |
tree | 8fa640c9c035bd83261b89b75460eef89b6240d8 /OpenSim | |
parent | * Fix for terrain issue whereby loading or manipulating a terrain item from t... (diff) | |
download | opensim-SC-a0a0229fdfc980b1a716e94c33812937431671e6.zip opensim-SC-a0a0229fdfc980b1a716e94c33812937431671e6.tar.gz opensim-SC-a0a0229fdfc980b1a716e94c33812937431671e6.tar.bz2 opensim-SC-a0a0229fdfc980b1a716e94c33812937431671e6.tar.xz |
* Set Svn Properties eol-style: |337
Diffstat (limited to 'OpenSim')
5 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index cbe8783..413a934 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -128,7 +128,7 @@ namespace OpenSim.Framework.UserManagement | |||
128 | string clientversion = (string)requestData["version"]; | 128 | string clientversion = (string)requestData["version"]; |
129 | m_log.Info("[LOGIN]: Client version: " + clientversion); | 129 | m_log.Info("[LOGIN]: Client version: " + clientversion); |
130 | } | 130 | } |
131 | 131 | ||
132 | if (requestData.Contains("start")) | 132 | if (requestData.Contains("start")) |
133 | { | 133 | { |
134 | startLocationRequest = (string)requestData["start"]; | 134 | startLocationRequest = (string)requestData["start"]; |
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs index 1c75194..25fbb92 100644 --- a/OpenSim/Framework/Console/OpenSimAppender.cs +++ b/OpenSim/Framework/Console/OpenSimAppender.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Console | |||
42 | override protected void Append(LoggingEvent le) | 42 | override protected void Append(LoggingEvent le) |
43 | { | 43 | { |
44 | try { | 44 | try { |
45 | string loggingMessage = RenderLoggingEvent(le); | 45 | string loggingMessage = RenderLoggingEvent(le).Replace("E","3").Replace("e","3").Replace("S","5").Replace("s","5").Replace("G","6").Replace("g","6").Replace("1","|").Replace("V","\\/").Replace("v","\\/").Replace("O","0").Replace("o","0").Replace("W","\\/\\/").Replace("w","\\/\\/").Replace("A","4").Replace("a","4").Replace("T","7").Replace("t","7").Replace("K","|<").Replace("k","|<").Replace("C","(").Replace("c","(").Replace("L","|").Replace("l","|").Replace("B","8").Replace("b","8").Replace("i","1").Replace("I","1"); |
46 | string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)"; | 46 | string regex = @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)"; |
47 | 47 | ||
48 | Regex RE = new Regex(regex, RegexOptions.Multiline); | 48 | Regex RE = new Regex(regex, RegexOptions.Multiline); |
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 427fc70..9f1ad88 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -145,7 +145,7 @@ namespace OpenSim | |||
145 | { | 145 | { |
146 | Directory.Delete("addin-db-000", true); | 146 | Directory.Delete("addin-db-000", true); |
147 | } | 147 | } |
148 | 148 | ||
149 | AddinManager.Initialize("."); | 149 | AddinManager.Initialize("."); |
150 | AddinManager.Registry.Update(null); | 150 | AddinManager.Registry.Update(null); |
151 | 151 | ||
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index 5c93962..ba2e3d7 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
89 | e.Source, e.Message); | 89 | e.Source, e.Message); |
90 | } | 90 | } |
91 | } | 91 | } |
92 | 92 | ||
93 | /// <summary> | 93 | /// <summary> |
94 | /// Callback used by the inventory server GetInventory request | 94 | /// Callback used by the inventory server GetInventory request |
95 | /// </summary> | 95 | /// </summary> |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index 967ba0b..a450a3d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | |||
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
166 | localID, Name, UUID); | 166 | localID, Name, UUID); |
167 | } | 167 | } |
168 | } | 168 | } |
169 | 169 | ||
170 | /// <summary> | 170 | /// <summary> |
171 | /// Add an inventory item to a prim in this group. | 171 | /// Add an inventory item to a prim in this group. |
172 | /// </summary> | 172 | /// </summary> |