aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-05 19:32:27 +0000
committerJustin Clarke Casey2009-03-05 19:32:27 +0000
commit6c735e0828063dd6e83dc6bd4c35266dd948035e (patch)
tree9593d8bf7bd700d364924d1d13d51bd564cebb8d /OpenSim/Region/CoreModules
parent* remove now unused serialization code (diff)
downloadopensim-SC_OLD-6c735e0828063dd6e83dc6bd4c35266dd948035e.zip
opensim-SC_OLD-6c735e0828063dd6e83dc6bd4c35266dd948035e.tar.gz
opensim-SC_OLD-6c735e0828063dd6e83dc6bd4c35266dd948035e.tar.bz2
opensim-SC_OLD-6c735e0828063dd6e83dc6bd4c35266dd948035e.tar.xz
* Replace some string to byte conversions for object/item name/description fields with the LLUtil function that prevents the max string size from being breached
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 551c6e2..337644d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -81,9 +81,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
81 } 81 }
82 } 82 }
83 83
84 m_log.InfoFormat("[CHAT] initialized for {0} w:{1} s:{2} S:{3}", scene.RegionInfo.RegionName, 84 m_log.InfoFormat("[CHAT]: Initialized for {0} w:{1} s:{2} S:{3}", scene.RegionInfo.RegionName,
85 m_whisperdistance, m_saydistance, m_shoutdistance); 85 m_whisperdistance, m_saydistance, m_shoutdistance);
86 } 86 }
87
87 public virtual void PostInitialise() 88 public virtual void PostInitialise()
88 { 89 {
89 } 90 }
@@ -199,8 +200,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
199 } 200 }
200 } 201 }
201 202
202
203 static private Vector3 CenterOfRegion = new Vector3(128, 128, 30); 203 static private Vector3 CenterOfRegion = new Vector3(128, 128, 30);
204
204 public virtual void OnChatBroadcast(Object sender, OSChatMessage c) 205 public virtual void OnChatBroadcast(Object sender, OSChatMessage c)
205 { 206 {
206 // unless the chat to be broadcast is of type Region, we 207 // unless the chat to be broadcast is of type Region, we
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index fe97714..4ae617d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Land
101 101
102 lock (m_scene) 102 lock (m_scene)
103 { 103 {
104 m_scene.LandChannel = (ILandChannel) landChannel; 104 m_scene.LandChannel = (ILandChannel)landChannel;
105 } 105 }
106 } 106 }
107 107