diff options
author | Melanie | 2012-07-06 20:51:18 +0100 |
---|---|---|
committer | Melanie | 2012-07-06 20:51:18 +0100 |
commit | 26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2 (patch) | |
tree | bf9802d765a4965dd1b42c4b2d3145b5813c0c1f /OpenSim/Region/CoreModules | |
parent | Merge branch 'master' into careminster (diff) | |
parent | added llSetVelocity. will refuse to work on vehicles and on attachments ( th... (diff) | |
download | opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.zip opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.gz opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.bz2 opensim-SC_OLD-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.xz |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandObject.cs | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index bc42fd1..dbbb0ae 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -351,9 +351,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
351 | UUID fromAgentID, string fromName, ChatTypeEnum type, | 351 | UUID fromAgentID, string fromName, ChatTypeEnum type, |
352 | string message, ChatSourceType src) | 352 | string message, ChatSourceType src) |
353 | { | 353 | { |
354 | // don't send llRegionSay to child agents. Send normal chat because you | 354 | // don't send chat to child agents |
355 | // can't talk across sim borders if it's not done | 355 | if (presence.IsChildAgent) return false; |
356 | if (type == ChatTypeEnum.Broadcast && presence.IsChildAgent) return false; | ||
357 | 356 | ||
358 | Vector3 fromRegionPos = fromPos + regionPos; | 357 | Vector3 fromRegionPos = fromPos + regionPos; |
359 | Vector3 toRegionPos = presence.AbsolutePosition + | 358 | Vector3 toRegionPos = presence.AbsolutePosition + |
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index 192b4f6..7f2f147 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -184,9 +184,9 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
184 | 184 | ||
185 | string uri = "/lslhttp/" + urlcode.ToString(); | 185 | string uri = "/lslhttp/" + urlcode.ToString(); |
186 | 186 | ||
187 | m_HttpServer.AddPollServiceHTTPHandler( | 187 | PollServiceEventArgs args = new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode, 25000); |
188 | uri, | 188 | args.Type = PollServiceEventArgs.EventType.LslHttp; |
189 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 189 | m_HttpServer.AddPollServiceHTTPHandler(uri, args); |
190 | 190 | ||
191 | m_log.DebugFormat( | 191 | m_log.DebugFormat( |
192 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", | 192 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", |
@@ -232,7 +232,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
232 | 232 | ||
233 | m_HttpsServer.AddPollServiceHTTPHandler( | 233 | m_HttpsServer.AddPollServiceHTTPHandler( |
234 | uri, | 234 | uri, |
235 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 235 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode,25000)); |
236 | 236 | ||
237 | m_log.DebugFormat( | 237 | m_log.DebugFormat( |
238 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", | 238 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", |
@@ -446,7 +446,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
446 | } | 446 | } |
447 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) | 447 | private Hashtable GetEvents(UUID requestID, UUID sessionID, string request) |
448 | { | 448 | { |
449 | UrlData url = null; | 449 | UrlData url = null; |
450 | RequestData requestData = null; | 450 | RequestData requestData = null; |
451 | 451 | ||
452 | lock (m_RequestMap) | 452 | lock (m_RequestMap) |
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index b7667b9..4f06737 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs | |||
@@ -200,7 +200,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
200 | * (long)m_scene.RegionInfo.ObjectCapacity | 200 | * (long)m_scene.RegionInfo.ObjectCapacity |
201 | * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus | 201 | * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus |
202 | / 65536L); | 202 | / 65536L); |
203 | m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax); | 203 | //m_log.DebugFormat("Area: {0}, Capacity {1}, Bonus {2}, Parcel {3}", LandData.Area, m_scene.RegionInfo.ObjectCapacity, m_scene.RegionInfo.RegionSettings.ObjectBonus, parcelMax); |
204 | return parcelMax; | 204 | return parcelMax; |
205 | } | 205 | } |
206 | } | 206 | } |