diff options
author | Melanie | 2012-06-26 17:35:55 +0100 |
---|---|---|
committer | Melanie | 2012-06-26 17:35:55 +0100 |
commit | 7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9 (patch) | |
tree | 5492a786c85a7edd63fb8ad0c3c6f1da8d700741 /OpenSim/Framework | |
parent | Merge branch 'master' into careminster (diff) | |
parent | When attachments are being saved and deleted for a closing root agent, delete... (diff) | |
download | opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.zip opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.gz opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.bz2 opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Framework')
3 files changed, 12 insertions, 6 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 264625d..7bbb290 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -321,7 +321,7 @@ namespace OpenSim.Framework.Servers | |||
321 | TimeSpan timeTaken = DateTime.Now - m_startuptime; | 321 | TimeSpan timeTaken = DateTime.Now - m_startuptime; |
322 | 322 | ||
323 | m_log.InfoFormat( | 323 | m_log.InfoFormat( |
324 | "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS.", | 324 | "[STARTUP]: Non-script portion of startup took {0}m {1}s. PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.", |
325 | timeTaken.Minutes, timeTaken.Seconds); | 325 | timeTaken.Minutes, timeTaken.Seconds); |
326 | } | 326 | } |
327 | 327 | ||
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs index 9d512c6..3089351 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs | |||
@@ -28,6 +28,7 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections; | 29 | using System.Collections; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | |||
31 | namespace OpenSim.Framework.Servers.HttpServer | 32 | namespace OpenSim.Framework.Servers.HttpServer |
32 | { | 33 | { |
33 | public delegate void RequestMethod(UUID requestID, Hashtable request); | 34 | public delegate void RequestMethod(UUID requestID, Hashtable request); |
@@ -44,7 +45,11 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
44 | public NoEventsMethod NoEvents; | 45 | public NoEventsMethod NoEvents; |
45 | public RequestMethod Request; | 46 | public RequestMethod Request; |
46 | public UUID Id; | 47 | public UUID Id; |
47 | public PollServiceEventArgs(RequestMethod pRequest, HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,UUID pId) | 48 | |
49 | public PollServiceEventArgs( | ||
50 | RequestMethod pRequest, | ||
51 | HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents, | ||
52 | UUID pId) | ||
48 | { | 53 | { |
49 | Request = pRequest; | 54 | Request = pRequest; |
50 | HasEvents = pHasEvents; | 55 | HasEvents = pHasEvents; |
@@ -53,4 +58,4 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
53 | Id = pId; | 58 | Id = pId; |
54 | } | 59 | } |
55 | } | 60 | } |
56 | } | 61 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs index 553a7eb..723530a 100644 --- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs +++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs | |||
@@ -31,7 +31,6 @@ using OpenMetaverse; | |||
31 | 31 | ||
32 | namespace OpenSim.Framework.Servers.HttpServer | 32 | namespace OpenSim.Framework.Servers.HttpServer |
33 | { | 33 | { |
34 | |||
35 | public class PollServiceHttpRequest | 34 | public class PollServiceHttpRequest |
36 | { | 35 | { |
37 | public readonly PollServiceEventArgs PollServiceArgs; | 36 | public readonly PollServiceEventArgs PollServiceArgs; |
@@ -39,7 +38,9 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
39 | public readonly IHttpRequest Request; | 38 | public readonly IHttpRequest Request; |
40 | public readonly int RequestTime; | 39 | public readonly int RequestTime; |
41 | public readonly UUID RequestID; | 40 | public readonly UUID RequestID; |
42 | public PollServiceHttpRequest(PollServiceEventArgs pPollServiceArgs, IHttpClientContext pHttpContext, IHttpRequest pRequest) | 41 | |
42 | public PollServiceHttpRequest( | ||
43 | PollServiceEventArgs pPollServiceArgs, IHttpClientContext pHttpContext, IHttpRequest pRequest) | ||
43 | { | 44 | { |
44 | PollServiceArgs = pPollServiceArgs; | 45 | PollServiceArgs = pPollServiceArgs; |
45 | HttpContext = pHttpContext; | 46 | HttpContext = pHttpContext; |
@@ -48,4 +49,4 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
48 | RequestID = UUID.Random(); | 49 | RequestID = UUID.Random(); |
49 | } | 50 | } |
50 | } | 51 | } |
51 | } | 52 | } \ No newline at end of file |