diff options
author | BlueWall | 2011-03-17 05:48:42 -0400 |
---|---|---|
committer | BlueWall | 2011-03-17 05:48:42 -0400 |
commit | a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f (patch) | |
tree | b034355a12c4d87410809aa19bf6015e611e1e22 /OpenSim/Region | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f.zip opensim-SC_OLD-a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f.tar.gz opensim-SC_OLD-a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f.tar.bz2 opensim-SC_OLD-a3651eb5d0325807baa9a2bdc9a1bae8d413bc9f.tar.xz |
Thanks Kevin Cozens for a patch that:
Fixes several spelling mistakes
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs index 88f392d..00b0aa9 100644 --- a/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs +++ b/OpenSim/Region/CoreModules/LightShare/LightShareModule.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
75 | m_scene = scene; | 75 | m_scene = scene; |
76 | m_scene.RegisterModuleInterface<IRegionModule>(this); | 76 | m_scene.RegisterModuleInterface<IRegionModule>(this); |
77 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; | 77 | m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole; |
78 | 78 | ||
79 | // ini file settings | 79 | // ini file settings |
80 | try | 80 | try |
81 | { | 81 | { |
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare | |||
229 | { | 229 | { |
230 | Command wlload = new Command("load", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleLoad, "Load windlight profile from the database and broadcast"); | 230 | Command wlload = new Command("load", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleLoad, "Load windlight profile from the database and broadcast"); |
231 | Command wlenable = new Command("enable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleEnable, "Enable the windlight plugin"); | 231 | Command wlenable = new Command("enable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleEnable, "Enable the windlight plugin"); |
232 | Command wldisable = new Command("disable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleDisable, "Enable the windlight plugin"); | 232 | Command wldisable = new Command("disable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleDisable, "Disable the windlight plugin"); |
233 | 233 | ||
234 | m_commander.RegisterCommand("load", wlload); | 234 | m_commander.RegisterCommand("load", wlload); |
235 | m_commander.RegisterCommand("enable", wlenable); | 235 | m_commander.RegisterCommand("enable", wlenable); |
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs index 071314a..aa14054 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs | |||
@@ -188,17 +188,17 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
188 | } | 188 | } |
189 | catch (DllNotFoundException) | 189 | catch (DllNotFoundException) |
190 | { | 190 | { |
191 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg is not installed correctly on this system. Asset Data is emtpy for {0}", id); | 191 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg is not installed correctly on this system. Asset Data is empty for {0}", id); |
192 | 192 | ||
193 | } | 193 | } |
194 | catch (IndexOutOfRangeException) | 194 | catch (IndexOutOfRangeException) |
195 | { | 195 | { |
196 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this. Asset Data is emtpy for {0}", id); | 196 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this. Asset Data is empty for {0}", id); |
197 | 197 | ||
198 | } | 198 | } |
199 | catch (Exception) | 199 | catch (Exception) |
200 | { | 200 | { |
201 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this. Asset Data is emtpy for {0}", id); | 201 | m_log.ErrorFormat("[TexturedMapTileRenderer]: OpenJpeg was unable to encode this. Asset Data is empty for {0}", id); |
202 | 202 | ||
203 | } | 203 | } |
204 | return null; | 204 | return null; |