diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Capabilities/Caps.cs (renamed from OpenSim/Framework/Capabilities/Caps.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/CapsHandlers.cs (renamed from OpenSim/Framework/Capabilities/CapsHandlers.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/Handlers/CapsServerConnector.cs | 73 | ||||
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetTextureHandler.cs (renamed from OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs) | 58 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSD.cs (renamed from OpenSim/Framework/Capabilities/LLSD.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDArray.cs (renamed from OpenSim/Framework/Capabilities/LLSDArray.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDAssetUploadComplete.cs (renamed from OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDAssetUploadRequest.cs (renamed from OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDAssetUploadResponse.cs (renamed from OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDCapEvent.cs (renamed from OpenSim/Framework/Capabilities/LLSDCapEvent.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDEmpty.cs (renamed from OpenSim/Framework/Capabilities/LLSDEmpty.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDHelpers.cs (renamed from OpenSim/Framework/Capabilities/LLSDHelpers.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDInventoryFolder.cs (renamed from OpenSim/Framework/Capabilities/LLSDInventoryFolder.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDInventoryItem.cs (renamed from OpenSim/Framework/Capabilities/LLSDInventoryItem.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDItemUpdate.cs (renamed from OpenSim/Framework/Capabilities/LLSDItemUpdate.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDMapLayer.cs (renamed from OpenSim/Framework/Capabilities/LLSDMapLayer.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDMapLayerResponse.cs (renamed from OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDMapRequest.cs (renamed from OpenSim/Framework/Capabilities/LLSDMapRequest.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDMethod.cs (renamed from OpenSim/Framework/Capabilities/LLSDMethod.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDMethodString.cs (renamed from OpenSim/Framework/Capabilities/LLSDMethodString.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDParcelVoiceInfoResponse.cs (renamed from OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDRemoteParcelResponse.cs (renamed from OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDStreamHandler.cs (renamed from OpenSim/Framework/Capabilities/LLSDStreamHandler.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDTaskInventoryUploadComplete.cs (renamed from OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDTaskScriptUpdate.cs (renamed from OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDTaskScriptUploadComplete.cs (renamed from OpenSim/Framework/Capabilities/LLSDTaskScriptUploadComplete.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDTest.cs (renamed from OpenSim/Framework/Capabilities/LLSDTest.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDType.cs (renamed from OpenSim/Framework/Capabilities/LLSDType.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Capabilities/LLSDVoiceAccountResponse.cs (renamed from OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Framework/CapsUtil.cs (renamed from OpenSim/Framework/Capabilities/CapsUtil.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/CapabilitiesModule.cs (renamed from OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs (renamed from OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs) | 14 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs (renamed from OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs) | 18 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs (renamed from OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 97 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs (renamed from OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs (renamed from OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs (renamed from OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/IncomingPacket.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/IncomingPacketHistoryCollection.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/IncomingPacketHistoryCollection.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/OutgoingPacket.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/OutgoingPacket.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLPacketServer.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLUDPServer.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/ThrottleRates.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs (renamed from OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs) | 0 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/DataRequestHandler.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEventQueue.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/UserStatistics/WebStatsModule.cs | 1 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginResponse.cs | 1 | ||||
-rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 1 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 1 | ||||
-rw-r--r-- | prebuild.xml | 81 |
65 files changed, 274 insertions, 101 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index 3be97b5..3be97b5 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs | |||
diff --git a/OpenSim/Framework/Capabilities/CapsHandlers.cs b/OpenSim/Capabilities/CapsHandlers.cs index e1c800e..e1c800e 100644 --- a/OpenSim/Framework/Capabilities/CapsHandlers.cs +++ b/OpenSim/Capabilities/CapsHandlers.cs | |||
diff --git a/OpenSim/Capabilities/Handlers/CapsServerConnector.cs b/OpenSim/Capabilities/Handlers/CapsServerConnector.cs new file mode 100644 index 0000000..561d767 --- /dev/null +++ b/OpenSim/Capabilities/Handlers/CapsServerConnector.cs | |||
@@ -0,0 +1,73 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using Nini.Config; | ||
30 | using OpenSim.Server.Base; | ||
31 | using OpenSim.Services.Interfaces; | ||
32 | using OpenSim.Framework.Servers.HttpServer; | ||
33 | using OpenSim.Server.Handlers.Base; | ||
34 | using OpenMetaverse; | ||
35 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
36 | |||
37 | namespace OpenSim.Capabilities.Handlers | ||
38 | { | ||
39 | public class CapsServerConnector : ServiceConnector | ||
40 | { | ||
41 | private IAssetService m_AssetService; | ||
42 | private string m_ConfigName = "CapsService"; | ||
43 | |||
44 | public CapsServerConnector(IConfigSource config, IHttpServer server, string configName) : | ||
45 | base(config, server, configName) | ||
46 | { | ||
47 | if (configName != String.Empty) | ||
48 | m_ConfigName = configName; | ||
49 | |||
50 | IConfig serverConfig = config.Configs[m_ConfigName]; | ||
51 | if (serverConfig == null) | ||
52 | throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName)); | ||
53 | |||
54 | string assetService = serverConfig.GetString("LocalServiceModule", | ||
55 | String.Empty); | ||
56 | |||
57 | if (assetService == String.Empty) | ||
58 | throw new Exception("No LocalServiceModule in config file"); | ||
59 | |||
60 | Object[] args = new Object[] { config }; | ||
61 | m_AssetService = | ||
62 | ServerUtils.LoadPlugin<IAssetService>(assetService, args); | ||
63 | |||
64 | if (m_AssetService == null) | ||
65 | throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); | ||
66 | |||
67 | bool allowDelete = serverConfig.GetBoolean("AllowRemoteDelete", false); | ||
68 | |||
69 | server.AddStreamHandler(new GetTextureHandler("/CAPS/" + UUID.Random() + "/", m_AssetService)); | ||
70 | } | ||
71 | |||
72 | } | ||
73 | } | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Capabilities/Handlers/GetTextureHandler.cs index df4d561..00186ee 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs +++ b/OpenSim/Capabilities/Handlers/GetTextureHandler.cs | |||
@@ -42,39 +42,16 @@ using OpenSim.Framework; | |||
42 | using OpenSim.Framework.Servers; | 42 | using OpenSim.Framework.Servers; |
43 | using OpenSim.Framework.Servers.HttpServer; | 43 | using OpenSim.Framework.Servers.HttpServer; |
44 | using OpenSim.Region.Framework.Interfaces; | 44 | using OpenSim.Region.Framework.Interfaces; |
45 | using OpenSim.Region.Framework.Scenes; | ||
46 | using OpenSim.Services.Interfaces; | 45 | using OpenSim.Services.Interfaces; |
47 | using Caps = OpenSim.Framework.Capabilities.Caps; | 46 | using Caps = OpenSim.Framework.Capabilities.Caps; |
48 | 47 | ||
49 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | 48 | namespace OpenSim.Capabilities.Handlers |
50 | { | 49 | { |
51 | #region Stream Handler | ||
52 | 50 | ||
53 | public delegate byte[] StreamHandlerCallback(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse); | 51 | public class GetTextureHandler : BaseStreamHandler |
54 | |||
55 | public class StreamHandler : BaseStreamHandler | ||
56 | { | ||
57 | StreamHandlerCallback m_callback; | ||
58 | |||
59 | public StreamHandler(string httpMethod, string path, StreamHandlerCallback callback) | ||
60 | : base(httpMethod, path) | ||
61 | { | ||
62 | m_callback = callback; | ||
63 | } | ||
64 | |||
65 | public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
66 | { | ||
67 | return m_callback(path, request, httpRequest, httpResponse); | ||
68 | } | ||
69 | } | ||
70 | |||
71 | #endregion Stream Handler | ||
72 | |||
73 | public class GetTextureModule : IRegionModule | ||
74 | { | 52 | { |
75 | private static readonly ILog m_log = | 53 | private static readonly ILog m_log = |
76 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 54 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
77 | private Scene m_scene; | ||
78 | private IAssetService m_assetService; | 55 | private IAssetService m_assetService; |
79 | 56 | ||
80 | public const string DefaultFormat = "x-j2c"; | 57 | public const string DefaultFormat = "x-j2c"; |
@@ -82,36 +59,13 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | |||
82 | // TODO: Change this to a config option | 59 | // TODO: Change this to a config option |
83 | const string REDIRECT_URL = null; | 60 | const string REDIRECT_URL = null; |
84 | 61 | ||
85 | 62 | public GetTextureHandler(string path, IAssetService assService) : | |
86 | #region IRegionModule Members | 63 | base("GET", path) |
87 | |||
88 | public void Initialise(Scene pScene, IConfigSource pSource) | ||
89 | { | ||
90 | m_scene = pScene; | ||
91 | } | ||
92 | |||
93 | public void PostInitialise() | ||
94 | { | ||
95 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | ||
96 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | ||
97 | } | ||
98 | |||
99 | public void Close() { } | ||
100 | |||
101 | public string Name { get { return "GetTextureModule"; } } | ||
102 | public bool IsSharedModule { get { return false; } } | ||
103 | |||
104 | public void RegisterCaps(UUID agentID, Caps caps) | ||
105 | { | 64 | { |
106 | UUID capID = UUID.Random(); | 65 | m_assetService = assService; |
107 | |||
108 | // m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | ||
109 | caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | ||
110 | } | 66 | } |
111 | 67 | ||
112 | #endregion | 68 | public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
113 | |||
114 | private byte[] ProcessGetTexture(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | ||
115 | { | 69 | { |
116 | //m_log.DebugFormat("[GETTEXTURE]: called in {0}", m_scene.RegionInfo.RegionName); | 70 | //m_log.DebugFormat("[GETTEXTURE]: called in {0}", m_scene.RegionInfo.RegionName); |
117 | 71 | ||
diff --git a/OpenSim/Framework/Capabilities/LLSD.cs b/OpenSim/Capabilities/LLSD.cs index eec9e61..eec9e61 100644 --- a/OpenSim/Framework/Capabilities/LLSD.cs +++ b/OpenSim/Capabilities/LLSD.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDArray.cs b/OpenSim/Capabilities/LLSDArray.cs index 3459e49..3459e49 100644 --- a/OpenSim/Framework/Capabilities/LLSDArray.cs +++ b/OpenSim/Capabilities/LLSDArray.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs b/OpenSim/Capabilities/LLSDAssetUploadComplete.cs index ab6cee5..ab6cee5 100644 --- a/OpenSim/Framework/Capabilities/LLSDAssetUploadComplete.cs +++ b/OpenSim/Capabilities/LLSDAssetUploadComplete.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs index 6e66f0a..6e66f0a 100644 --- a/OpenSim/Framework/Capabilities/LLSDAssetUploadRequest.cs +++ b/OpenSim/Capabilities/LLSDAssetUploadRequest.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs index 0d6f7f9..0d6f7f9 100644 --- a/OpenSim/Framework/Capabilities/LLSDAssetUploadResponse.cs +++ b/OpenSim/Capabilities/LLSDAssetUploadResponse.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDCapEvent.cs b/OpenSim/Capabilities/LLSDCapEvent.cs index 63abd62..63abd62 100644 --- a/OpenSim/Framework/Capabilities/LLSDCapEvent.cs +++ b/OpenSim/Capabilities/LLSDCapEvent.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDEmpty.cs b/OpenSim/Capabilities/LLSDEmpty.cs index f94fcba..f94fcba 100644 --- a/OpenSim/Framework/Capabilities/LLSDEmpty.cs +++ b/OpenSim/Capabilities/LLSDEmpty.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDHelpers.cs b/OpenSim/Capabilities/LLSDHelpers.cs index 8f1a40e..8f1a40e 100644 --- a/OpenSim/Framework/Capabilities/LLSDHelpers.cs +++ b/OpenSim/Capabilities/LLSDHelpers.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDInventoryFolder.cs b/OpenSim/Capabilities/LLSDInventoryFolder.cs index 3c216e9..3c216e9 100644 --- a/OpenSim/Framework/Capabilities/LLSDInventoryFolder.cs +++ b/OpenSim/Capabilities/LLSDInventoryFolder.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs b/OpenSim/Capabilities/LLSDInventoryItem.cs index cce18d7..cce18d7 100644 --- a/OpenSim/Framework/Capabilities/LLSDInventoryItem.cs +++ b/OpenSim/Capabilities/LLSDInventoryItem.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs b/OpenSim/Capabilities/LLSDItemUpdate.cs index 96e2b61..96e2b61 100644 --- a/OpenSim/Framework/Capabilities/LLSDItemUpdate.cs +++ b/OpenSim/Capabilities/LLSDItemUpdate.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDMapLayer.cs b/OpenSim/Capabilities/LLSDMapLayer.cs index 4aeb1ff..4aeb1ff 100644 --- a/OpenSim/Framework/Capabilities/LLSDMapLayer.cs +++ b/OpenSim/Capabilities/LLSDMapLayer.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs b/OpenSim/Capabilities/LLSDMapLayerResponse.cs index 839e34c..839e34c 100644 --- a/OpenSim/Framework/Capabilities/LLSDMapLayerResponse.cs +++ b/OpenSim/Capabilities/LLSDMapLayerResponse.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDMapRequest.cs b/OpenSim/Capabilities/LLSDMapRequest.cs index debf387..debf387 100644 --- a/OpenSim/Framework/Capabilities/LLSDMapRequest.cs +++ b/OpenSim/Capabilities/LLSDMapRequest.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDMethod.cs b/OpenSim/Capabilities/LLSDMethod.cs index cd2574d..cd2574d 100644 --- a/OpenSim/Framework/Capabilities/LLSDMethod.cs +++ b/OpenSim/Capabilities/LLSDMethod.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDMethodString.cs b/OpenSim/Capabilities/LLSDMethodString.cs index 38700d5..38700d5 100644 --- a/OpenSim/Framework/Capabilities/LLSDMethodString.cs +++ b/OpenSim/Capabilities/LLSDMethodString.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs b/OpenSim/Capabilities/LLSDParcelVoiceInfoResponse.cs index b34a668..b34a668 100644 --- a/OpenSim/Framework/Capabilities/LLSDParcelVoiceInfoResponse.cs +++ b/OpenSim/Capabilities/LLSDParcelVoiceInfoResponse.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Capabilities/LLSDRemoteParcelResponse.cs index 13d69d3..13d69d3 100644 --- a/OpenSim/Framework/Capabilities/LLSDRemoteParcelResponse.cs +++ b/OpenSim/Capabilities/LLSDRemoteParcelResponse.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs b/OpenSim/Capabilities/LLSDStreamHandler.cs index 7aaa994..7aaa994 100644 --- a/OpenSim/Framework/Capabilities/LLSDStreamHandler.cs +++ b/OpenSim/Capabilities/LLSDStreamHandler.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs b/OpenSim/Capabilities/LLSDTaskInventoryUploadComplete.cs index 47fdaca..47fdaca 100644 --- a/OpenSim/Framework/Capabilities/LLSDTaskInventoryUploadComplete.cs +++ b/OpenSim/Capabilities/LLSDTaskInventoryUploadComplete.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs b/OpenSim/Capabilities/LLSDTaskScriptUpdate.cs index 9d7c17f..9d7c17f 100644 --- a/OpenSim/Framework/Capabilities/LLSDTaskScriptUpdate.cs +++ b/OpenSim/Capabilities/LLSDTaskScriptUpdate.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDTaskScriptUploadComplete.cs b/OpenSim/Capabilities/LLSDTaskScriptUploadComplete.cs index d308831..d308831 100644 --- a/OpenSim/Framework/Capabilities/LLSDTaskScriptUploadComplete.cs +++ b/OpenSim/Capabilities/LLSDTaskScriptUploadComplete.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDTest.cs b/OpenSim/Capabilities/LLSDTest.cs index 5f77c3d..5f77c3d 100644 --- a/OpenSim/Framework/Capabilities/LLSDTest.cs +++ b/OpenSim/Capabilities/LLSDTest.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDType.cs b/OpenSim/Capabilities/LLSDType.cs index d5ca1ab..d5ca1ab 100644 --- a/OpenSim/Framework/Capabilities/LLSDType.cs +++ b/OpenSim/Capabilities/LLSDType.cs | |||
diff --git a/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs b/OpenSim/Capabilities/LLSDVoiceAccountResponse.cs index 53c11e7..53c11e7 100644 --- a/OpenSim/Framework/Capabilities/LLSDVoiceAccountResponse.cs +++ b/OpenSim/Capabilities/LLSDVoiceAccountResponse.cs | |||
diff --git a/OpenSim/Framework/Capabilities/CapsUtil.cs b/OpenSim/Framework/CapsUtil.cs index faf2708..4baf505 100644 --- a/OpenSim/Framework/Capabilities/CapsUtil.cs +++ b/OpenSim/Framework/CapsUtil.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | 29 | ||
30 | namespace OpenSim.Framework.Capabilities | 30 | namespace OpenSim.Framework |
31 | { | 31 | { |
32 | /// <summary> | 32 | /// <summary> |
33 | /// Capabilities utility methods | 33 | /// Capabilities utility methods |
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/CapabilitiesModule.cs index 1d8e70e..b136555 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/CapabilitiesModule.cs | |||
@@ -31,6 +31,7 @@ using System.Collections.Generic; | |||
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using log4net; | 32 | using log4net; |
33 | using Nini.Config; | 33 | using Nini.Config; |
34 | using Mono.Addins; | ||
34 | using OpenMetaverse; | 35 | using OpenMetaverse; |
35 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
@@ -38,8 +39,9 @@ using OpenSim.Region.Framework.Interfaces; | |||
38 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
39 | using Caps=OpenSim.Framework.Capabilities.Caps; | 40 | using Caps=OpenSim.Framework.Capabilities.Caps; |
40 | 41 | ||
41 | namespace OpenSim.Region.CoreModules.Agent.Capabilities | 42 | namespace OpenSim.Region.ClientStack.Linden |
42 | { | 43 | { |
44 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
43 | public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule | 45 | public class CapabilitiesModule : INonSharedRegionModule, ICapabilitiesModule |
44 | { | 46 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 05fe3ee..4827baa 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
@@ -33,6 +33,7 @@ using System.Reflection; | |||
33 | using System.Threading; | 33 | using System.Threading; |
34 | using log4net; | 34 | using log4net; |
35 | using Nini.Config; | 35 | using Nini.Config; |
36 | using Mono.Addins; | ||
36 | using OpenMetaverse; | 37 | using OpenMetaverse; |
37 | using OpenMetaverse.Messages.Linden; | 38 | using OpenMetaverse.Messages.Linden; |
38 | using OpenMetaverse.Packets; | 39 | using OpenMetaverse.Packets; |
@@ -45,7 +46,7 @@ using OpenSim.Region.Framework.Scenes; | |||
45 | using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; | 46 | using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>; |
46 | using Caps=OpenSim.Framework.Capabilities.Caps; | 47 | using Caps=OpenSim.Framework.Capabilities.Caps; |
47 | 48 | ||
48 | namespace OpenSim.Region.CoreModules.Framework.EventQueue | 49 | namespace OpenSim.Region.ClientStack.Linden |
49 | { | 50 | { |
50 | public struct QueueItem | 51 | public struct QueueItem |
51 | { | 52 | { |
@@ -53,6 +54,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
53 | public OSDMap body; | 54 | public OSDMap body; |
54 | } | 55 | } |
55 | 56 | ||
57 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
56 | public class EventQueueGetModule : IEventQueue, IRegionModule | 58 | public class EventQueueGetModule : IEventQueue, IRegionModule |
57 | { | 59 | { |
58 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 60 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -715,5 +717,15 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
715 | OSD item = EventQueueHelper.PlacesQuery(groupUpdate); | 717 | OSD item = EventQueueHelper.PlacesQuery(groupUpdate); |
716 | Enqueue(item, avatarID); | 718 | Enqueue(item, avatarID); |
717 | } | 719 | } |
720 | |||
721 | public OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono) | ||
722 | { | ||
723 | return EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, running, mono); | ||
724 | } | ||
725 | |||
726 | public OSD BuildEvent(string eventName, OSD eventBody) | ||
727 | { | ||
728 | return EventQueueHelper.BuildEvent(eventName, eventBody); | ||
729 | } | ||
718 | } | 730 | } |
719 | } | 731 | } |
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs index 0d7d16a..3f49aba 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs | |||
@@ -32,7 +32,7 @@ using OpenMetaverse.Packets; | |||
32 | using OpenMetaverse.StructuredData; | 32 | using OpenMetaverse.StructuredData; |
33 | using OpenMetaverse.Messages.Linden; | 33 | using OpenMetaverse.Messages.Linden; |
34 | 34 | ||
35 | namespace OpenSim.Region.CoreModules.Framework.EventQueue | 35 | namespace OpenSim.Region.ClientStack.Linden |
36 | { | 36 | { |
37 | public class EventQueueHelper | 37 | public class EventQueueHelper |
38 | { | 38 | { |
@@ -61,7 +61,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
61 | // return result; | 61 | // return result; |
62 | // } | 62 | // } |
63 | 63 | ||
64 | public static OSD buildEvent(string eventName, OSD eventBody) | 64 | public static OSD BuildEvent(string eventName, OSD eventBody) |
65 | { | 65 | { |
66 | OSDMap llsdEvent = new OSDMap(2); | 66 | OSDMap llsdEvent = new OSDMap(2); |
67 | llsdEvent.Add("message", new OSDString(eventName)); | 67 | llsdEvent.Add("message", new OSDString(eventName)); |
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
84 | OSDMap llsdBody = new OSDMap(1); | 84 | OSDMap llsdBody = new OSDMap(1); |
85 | llsdBody.Add("SimulatorInfo", arr); | 85 | llsdBody.Add("SimulatorInfo", arr); |
86 | 86 | ||
87 | return buildEvent("EnableSimulator", llsdBody); | 87 | return BuildEvent("EnableSimulator", llsdBody); |
88 | } | 88 | } |
89 | 89 | ||
90 | public static OSD DisableSimulator(ulong handle) | 90 | public static OSD DisableSimulator(ulong handle) |
@@ -99,7 +99,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
99 | OSDMap llsdBody = new OSDMap(0); | 99 | OSDMap llsdBody = new OSDMap(0); |
100 | //llsdBody.Add("SimulatorInfo", arr); | 100 | //llsdBody.Add("SimulatorInfo", arr); |
101 | 101 | ||
102 | return buildEvent("DisableSimulator", llsdBody); | 102 | return BuildEvent("DisableSimulator", llsdBody); |
103 | } | 103 | } |
104 | 104 | ||
105 | public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, | 105 | public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, |
@@ -144,7 +144,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
144 | llsdBody.Add("AgentData", agentDataArr); | 144 | llsdBody.Add("AgentData", agentDataArr); |
145 | llsdBody.Add("RegionData", regionDataArr); | 145 | llsdBody.Add("RegionData", regionDataArr); |
146 | 146 | ||
147 | return buildEvent("CrossedRegion", llsdBody); | 147 | return BuildEvent("CrossedRegion", llsdBody); |
148 | } | 148 | } |
149 | 149 | ||
150 | public static OSD TeleportFinishEvent( | 150 | public static OSD TeleportFinishEvent( |
@@ -167,7 +167,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
167 | OSDMap body = new OSDMap(); | 167 | OSDMap body = new OSDMap(); |
168 | body.Add("Info", infoArr); | 168 | body.Add("Info", infoArr); |
169 | 169 | ||
170 | return buildEvent("TeleportFinish", body); | 170 | return BuildEvent("TeleportFinish", body); |
171 | } | 171 | } |
172 | 172 | ||
173 | public static OSD ScriptRunningReplyEvent(UUID objectID, UUID itemID, bool running, bool mono) | 173 | public static OSD ScriptRunningReplyEvent(UUID objectID, UUID itemID, bool running, bool mono) |
@@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
184 | OSDMap body = new OSDMap(); | 184 | OSDMap body = new OSDMap(); |
185 | body.Add("Script", scriptArr); | 185 | body.Add("Script", scriptArr); |
186 | 186 | ||
187 | return buildEvent("ScriptRunningReply", body); | 187 | return BuildEvent("ScriptRunningReply", body); |
188 | } | 188 | } |
189 | 189 | ||
190 | public static OSD EstablishAgentCommunication(UUID agentID, string simIpAndPort, string seedcap) | 190 | public static OSD EstablishAgentCommunication(UUID agentID, string simIpAndPort, string seedcap) |
@@ -194,12 +194,12 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
194 | body.Add("sim-ip-and-port", new OSDString(simIpAndPort)); | 194 | body.Add("sim-ip-and-port", new OSDString(simIpAndPort)); |
195 | body.Add("seed-capability", new OSDString(seedcap)); | 195 | body.Add("seed-capability", new OSDString(seedcap)); |
196 | 196 | ||
197 | return buildEvent("EstablishAgentCommunication", body); | 197 | return BuildEvent("EstablishAgentCommunication", body); |
198 | } | 198 | } |
199 | 199 | ||
200 | public static OSD KeepAliveEvent() | 200 | public static OSD KeepAliveEvent() |
201 | { | 201 | { |
202 | return buildEvent("FAKEEVENT", new OSDMap()); | 202 | return BuildEvent("FAKEEVENT", new OSDMap()); |
203 | } | 203 | } |
204 | 204 | ||
205 | public static OSD AgentParams(UUID agentID, bool checkEstate, int godLevel, bool limitedToEstate) | 205 | public static OSD AgentParams(UUID agentID, bool checkEstate, int godLevel, bool limitedToEstate) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs index fc1ddef..1d57143 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | |||
@@ -44,7 +44,7 @@ using OpenSim.Region.Framework.Scenes; | |||
44 | using OpenSim.Services.Interfaces; | 44 | using OpenSim.Services.Interfaces; |
45 | using Caps = OpenSim.Framework.Capabilities.Caps; | 45 | using Caps = OpenSim.Framework.Capabilities.Caps; |
46 | 46 | ||
47 | namespace OpenSim.Region.CoreModules.Avatar.Assets | 47 | namespace OpenSim.Region.ClientStack.Linden |
48 | { | 48 | { |
49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
50 | public class GetMeshModule : INonSharedRegionModule | 50 | public class GetMeshModule : INonSharedRegionModule |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs new file mode 100644 index 0000000..341240d --- /dev/null +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | |||
@@ -0,0 +1,97 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections; | ||
30 | using System.Collections.Specialized; | ||
31 | using System.Drawing; | ||
32 | using System.Drawing.Imaging; | ||
33 | using System.Reflection; | ||
34 | using System.IO; | ||
35 | using System.Web; | ||
36 | using log4net; | ||
37 | using Nini.Config; | ||
38 | using Mono.Addins; | ||
39 | using OpenMetaverse; | ||
40 | using OpenMetaverse.StructuredData; | ||
41 | using OpenMetaverse.Imaging; | ||
42 | using OpenSim.Framework; | ||
43 | using OpenSim.Framework.Servers; | ||
44 | using OpenSim.Framework.Servers.HttpServer; | ||
45 | using OpenSim.Region.Framework.Interfaces; | ||
46 | using OpenSim.Region.Framework.Scenes; | ||
47 | using OpenSim.Services.Interfaces; | ||
48 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
49 | using OpenSim.Capabilities.Handlers; | ||
50 | |||
51 | namespace OpenSim.Region.ClientStack.Linden | ||
52 | { | ||
53 | |||
54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | ||
55 | public class GetTextureModule : IRegionModule | ||
56 | { | ||
57 | private static readonly ILog m_log = | ||
58 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
59 | private Scene m_scene; | ||
60 | private IAssetService m_assetService; | ||
61 | |||
62 | public const string DefaultFormat = "x-j2c"; | ||
63 | |||
64 | // TODO: Change this to a config option | ||
65 | const string REDIRECT_URL = null; | ||
66 | |||
67 | |||
68 | #region IRegionModule Members | ||
69 | |||
70 | public void Initialise(Scene pScene, IConfigSource pSource) | ||
71 | { | ||
72 | m_scene = pScene; | ||
73 | } | ||
74 | |||
75 | public void PostInitialise() | ||
76 | { | ||
77 | m_assetService = m_scene.RequestModuleInterface<IAssetService>(); | ||
78 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | ||
79 | } | ||
80 | |||
81 | public void Close() { } | ||
82 | |||
83 | public string Name { get { return "GetTextureModule"; } } | ||
84 | public bool IsSharedModule { get { return false; } } | ||
85 | |||
86 | public void RegisterCaps(UUID agentID, Caps caps) | ||
87 | { | ||
88 | UUID capID = UUID.Random(); | ||
89 | |||
90 | // m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName); | ||
91 | //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture)); | ||
92 | caps.RegisterHandler("GetTexture", new GetTextureHandler("/CAPS/" + capID + "/", m_assetService)); | ||
93 | } | ||
94 | |||
95 | #endregion | ||
96 | } | ||
97 | } | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs index 3d4c7b7..eddc288 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs | |||
@@ -45,7 +45,7 @@ using OpenSim.Services.Interfaces; | |||
45 | using Caps = OpenSim.Framework.Capabilities.Caps; | 45 | using Caps = OpenSim.Framework.Capabilities.Caps; |
46 | using OpenSim.Framework.Capabilities; | 46 | using OpenSim.Framework.Capabilities; |
47 | 47 | ||
48 | namespace OpenSim.Region.CoreModules.Avatar.Assets | 48 | namespace OpenSim.Region.ClientStack.Linden |
49 | { | 49 | { |
50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 50 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
51 | public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule | 51 | public class NewFileAgentInventoryVariablePriceModule : INonSharedRegionModule |
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs index a0d72ed..15139a3 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Region.Framework.Interfaces; | |||
39 | using OpenSim.Region.Framework.Scenes; | 39 | using OpenSim.Region.Framework.Scenes; |
40 | using Caps=OpenSim.Framework.Capabilities.Caps; | 40 | using Caps=OpenSim.Framework.Capabilities.Caps; |
41 | 41 | ||
42 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | 42 | namespace OpenSim.Region.ClientStack.Linden |
43 | { | 43 | { |
44 | public class ObjectAdd : IRegionModule | 44 | public class ObjectAdd : IRegionModule |
45 | { | 45 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index 3114d7f..3809f84 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
@@ -49,7 +49,7 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap; | |||
49 | using OpenSim.Framework.Capabilities; | 49 | using OpenSim.Framework.Capabilities; |
50 | using ExtraParamType = OpenMetaverse.ExtraParamType; | 50 | using ExtraParamType = OpenMetaverse.ExtraParamType; |
51 | 51 | ||
52 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | 52 | namespace OpenSim.Region.ClientStack.Linden |
53 | { | 53 | { |
54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
55 | public class UploadObjectAssetModule : INonSharedRegionModule | 55 | public class UploadObjectAssetModule : INonSharedRegionModule |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/IncomingPacket.cs b/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs index 90b3ede..90b3ede 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/IncomingPacket.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/IncomingPacketHistoryCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacketHistoryCollection.cs index 1f73a1d..1f73a1d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/IncomingPacketHistoryCollection.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacketHistoryCollection.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs index e9e2dca..e9e2dca 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/J2KImage.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/J2KImage.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 43903ce..43903ce 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs index 9e0db12..9e0db12 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLImageManager.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index ca5501d..ca5501d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index aff90c5..aff90c5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs index 6eebd9d..6eebd9d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/OpenSimUDPBase.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/OutgoingPacket.cs b/OpenSim/Region/ClientStack/Linden/UDP/OutgoingPacket.cs index 76c6c14..76c6c14 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/OutgoingPacket.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/OutgoingPacket.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs index daab84f..daab84f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs index 34c21aa..34c21aa 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs index 7d0757f..7d0757f 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLPacketServer.cs index e995d65..e995d65 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLPacketServer.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLUDPServer.cs index f98586d..f98586d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/TestLLUDPServer.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/ThrottleRates.cs b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs index c9aac0b..c9aac0b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/ThrottleRates.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/ThrottleRates.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs index 29fd1a4..29fd1a4 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/TokenBucket.cs | |||
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs index 793aefe..793aefe 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs | |||
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index 964e4b9..a505999 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs | |||
@@ -36,7 +36,7 @@ using OpenSim.Framework.Capabilities; | |||
36 | using OpenSim.Framework.Servers; | 36 | using OpenSim.Framework.Servers; |
37 | using OpenSim.Framework.Servers.HttpServer; | 37 | using OpenSim.Framework.Servers.HttpServer; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using Caps=OpenSim.Framework.Capabilities.Caps; | 39 | using Caps = OpenSim.Framework.Capabilities.Caps; |
40 | 40 | ||
41 | namespace OpenSim.Region.DataSnapshot | 41 | namespace OpenSim.Region.DataSnapshot |
42 | { | 42 | { |
diff --git a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs index 81e4952..bfa5d17 100644 --- a/OpenSim/Region/Framework/Interfaces/IEventQueue.cs +++ b/OpenSim/Region/Framework/Interfaces/IEventQueue.cs | |||
@@ -57,5 +57,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
57 | bool isModerator, bool textMute); | 57 | bool isModerator, bool textMute); |
58 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); | 58 | void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID); |
59 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); | 59 | void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID); |
60 | OSD ScriptRunningEvent(UUID objectID, UUID itemID, bool running, bool mono); | ||
61 | OSD BuildEvent(string eventName, OSD eventBody); | ||
60 | } | 62 | } |
61 | } | 63 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs index 8c01d75..2bf8489 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs | |||
@@ -34,12 +34,9 @@ using Nini.Config; | |||
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenMetaverse.StructuredData; | 35 | using OpenMetaverse.StructuredData; |
36 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
37 | using OpenSim.Region.CoreModules.Framework.EventQueue; | ||
38 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
40 | 39 | ||
41 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
42 | |||
43 | namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | 40 | namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups |
44 | { | 41 | { |
45 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 42 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
@@ -472,7 +469,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
472 | 469 | ||
473 | if (queue != null) | 470 | if (queue != null) |
474 | { | 471 | { |
475 | queue.Enqueue(EventQueueHelper.buildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId); | 472 | queue.Enqueue(queue.BuildEvent("ChatterBoxSessionStartReply", bodyMap), remoteClient.AgentId); |
476 | } | 473 | } |
477 | } | 474 | } |
478 | 475 | ||
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index a8dec63..1c791b9 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs | |||
@@ -39,13 +39,11 @@ using OpenMetaverse.StructuredData; | |||
39 | 39 | ||
40 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Communications; | 41 | using OpenSim.Framework.Communications; |
42 | using OpenSim.Region.CoreModules.Framework.EventQueue; | ||
43 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
44 | using OpenSim.Region.Framework.Scenes; | 43 | using OpenSim.Region.Framework.Scenes; |
45 | 44 | ||
46 | using OpenSim.Services.Interfaces; | 45 | using OpenSim.Services.Interfaces; |
47 | 46 | ||
48 | using Caps = OpenSim.Framework.Capabilities.Caps; | ||
49 | using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags; | 47 | using DirFindFlags = OpenMetaverse.DirectoryManager.DirFindFlags; |
50 | 48 | ||
51 | 49 | ||
@@ -1154,7 +1152,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
1154 | 1152 | ||
1155 | if (queue != null) | 1153 | if (queue != null) |
1156 | { | 1154 | { |
1157 | queue.Enqueue(EventQueueHelper.buildEvent("AgentGroupDataUpdate", llDataStruct), GetRequestingAgentID(remoteClient)); | 1155 | queue.Enqueue(queue.BuildEvent("AgentGroupDataUpdate", llDataStruct), GetRequestingAgentID(remoteClient)); |
1158 | } | 1156 | } |
1159 | 1157 | ||
1160 | } | 1158 | } |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 8629674..97ab411 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
@@ -41,7 +41,6 @@ using log4net; | |||
41 | using Nini.Config; | 41 | using Nini.Config; |
42 | using Amib.Threading; | 42 | using Amib.Threading; |
43 | using OpenSim.Framework; | 43 | using OpenSim.Framework; |
44 | using OpenSim.Region.CoreModules.Framework.EventQueue; | ||
45 | using OpenSim.Region.Framework.Scenes; | 44 | using OpenSim.Region.Framework.Scenes; |
46 | using OpenSim.Region.Framework.Interfaces; | 45 | using OpenSim.Region.Framework.Interfaces; |
47 | using OpenSim.Region.ScriptEngine.Shared; | 46 | using OpenSim.Region.ScriptEngine.Shared; |
@@ -1283,7 +1282,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
1283 | } | 1282 | } |
1284 | else | 1283 | else |
1285 | { | 1284 | { |
1286 | eq.Enqueue(EventQueueHelper.ScriptRunningReplyEvent(objectID, itemID, GetScriptState(itemID), true), | 1285 | eq.Enqueue(eq.ScriptRunningEvent(objectID, itemID, GetScriptState(itemID), true), |
1287 | controllingClient.AgentId); | 1286 | controllingClient.AgentId); |
1288 | } | 1287 | } |
1289 | } | 1288 | } |
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index a03cc4c..3139b8a 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs | |||
@@ -44,7 +44,6 @@ using OpenSim.Region.Framework.Interfaces; | |||
44 | using OpenSim.Region.Framework.Scenes; | 44 | using OpenSim.Region.Framework.Scenes; |
45 | using Mono.Data.SqliteClient; | 45 | using Mono.Data.SqliteClient; |
46 | 46 | ||
47 | |||
48 | using Caps = OpenSim.Framework.Capabilities.Caps; | 47 | using Caps = OpenSim.Framework.Capabilities.Caps; |
49 | 48 | ||
50 | using OSD = OpenMetaverse.StructuredData.OSD; | 49 | using OSD = OpenMetaverse.StructuredData.OSD; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs index ebd6f7c..ddc8855 100644 --- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs +++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs | |||
@@ -32,7 +32,6 @@ using System.Net; | |||
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | 33 | ||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Capabilities; | ||
36 | using OpenSim.Services.Interfaces; | 35 | using OpenSim.Services.Interfaces; |
37 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 36 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; |
38 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; | 37 | using FriendInfo = OpenSim.Services.Interfaces.FriendInfo; |
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 9bcc3dd..2ca2d15 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
@@ -38,7 +38,6 @@ using Nini.Config; | |||
38 | using OpenMetaverse; | 38 | using OpenMetaverse; |
39 | 39 | ||
40 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Capabilities; | ||
42 | using OpenSim.Framework.Console; | 41 | using OpenSim.Framework.Console; |
43 | using OpenSim.Server.Base; | 42 | using OpenSim.Server.Base; |
44 | using OpenSim.Services.Interfaces; | 43 | using OpenSim.Services.Interfaces; |
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 99517d2..d122409 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -39,7 +39,6 @@ using OpenSim.Region.Physics.Manager; | |||
39 | using OpenSim.Region.Framework; | 39 | using OpenSim.Region.Framework; |
40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Region.CoreModules.Agent.Capabilities; | ||
43 | using OpenSim.Region.CoreModules.Avatar.Gods; | 42 | using OpenSim.Region.CoreModules.Avatar.Gods; |
44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; | 43 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset; |
45 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication; | 44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication; |
diff --git a/prebuild.xml b/prebuild.xml index 1102c11..4fa48d1 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -660,19 +660,19 @@ | |||
660 | </Files> | 660 | </Files> |
661 | </Project> | 661 | </Project> |
662 | 662 | ||
663 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Capabilities" path="OpenSim/Framework/Capabilities" type="Library"> | 663 | <Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library"> |
664 | <Configuration name="Debug"> | 664 | <Configuration name="Debug"> |
665 | <Options> | 665 | <Options> |
666 | <OutputPath>../../../bin/</OutputPath> | 666 | <OutputPath>../../bin/</OutputPath> |
667 | </Options> | 667 | </Options> |
668 | </Configuration> | 668 | </Configuration> |
669 | <Configuration name="Release"> | 669 | <Configuration name="Release"> |
670 | <Options> | 670 | <Options> |
671 | <OutputPath>../../../bin/</OutputPath> | 671 | <OutputPath>../../bin/</OutputPath> |
672 | </Options> | 672 | </Options> |
673 | </Configuration> | 673 | </Configuration> |
674 | 674 | ||
675 | <ReferencePath>../../../bin/</ReferencePath> | 675 | <ReferencePath>../../bin/</ReferencePath> |
676 | <Reference name="System"/> | 676 | <Reference name="System"/> |
677 | <Reference name="System.Xml"/> | 677 | <Reference name="System.Xml"/> |
678 | <Reference name="System.Web"/> | 678 | <Reference name="System.Web"/> |
@@ -683,18 +683,18 @@ | |||
683 | <Reference name="OpenSim.Services.Interfaces"/> | 683 | <Reference name="OpenSim.Services.Interfaces"/> |
684 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 684 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
685 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 685 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
686 | <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code --> | ||
687 | <Reference name="Nini" path="../../../bin/"/> | 686 | <Reference name="Nini" path="../../../bin/"/> |
688 | <Reference name="log4net" path="../../../bin/"/> | 687 | <Reference name="log4net" path="../../../bin/"/> |
689 | 688 | ||
690 | <Files> | 689 | <Files> |
691 | <Match pattern="*.cs" recurse="true"> | 690 | <Match pattern="*.cs" recurse="false"> |
692 | <Exclude name="Tests" pattern="Tests"/> | 691 | <Exclude name="Tests" pattern="Tests"/> |
693 | </Match> | 692 | </Match> |
694 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | 693 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> |
695 | </Files> | 694 | </Files> |
696 | </Project> | 695 | </Project> |
697 | 696 | ||
697 | |||
698 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library"> | 698 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library"> |
699 | <Configuration name="Debug"> | 699 | <Configuration name="Debug"> |
700 | <Options> | 700 | <Options> |
@@ -714,7 +714,6 @@ | |||
714 | <Reference name="OpenSim.Framework"/> | 714 | <Reference name="OpenSim.Framework"/> |
715 | <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> | 715 | <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> |
716 | <Reference name="OpenSim.Data"/> | 716 | <Reference name="OpenSim.Data"/> |
717 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
718 | <Reference name="OpenSim.Framework.Servers"/> | 717 | <Reference name="OpenSim.Framework.Servers"/> |
719 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 718 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
720 | <Reference name="OpenSim.Framework.Console"/> | 719 | <Reference name="OpenSim.Framework.Console"/> |
@@ -760,7 +759,7 @@ | |||
760 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 759 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
761 | <Reference name="OpenSim.Services.Interfaces"/> | 760 | <Reference name="OpenSim.Services.Interfaces"/> |
762 | <Reference name="OpenSim.Framework"/> | 761 | <Reference name="OpenSim.Framework"/> |
763 | <Reference name="OpenSim.Framework.Capabilities"/> | 762 | <Reference name="OpenSim.Capabilities"/> |
764 | <Reference name="OpenSim.Framework.Communications"/> | 763 | <Reference name="OpenSim.Framework.Communications"/> |
765 | <Reference name="OpenSim.Data"/> | 764 | <Reference name="OpenSim.Data"/> |
766 | <Reference name="OpenSim.Framework.Console"/> | 765 | <Reference name="OpenSim.Framework.Console"/> |
@@ -1185,7 +1184,6 @@ | |||
1185 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 1184 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
1186 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1185 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
1187 | <Reference name="OpenSim.Framework"/> | 1186 | <Reference name="OpenSim.Framework"/> |
1188 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1189 | <Reference name="OpenSim.Framework.Console"/> | 1187 | <Reference name="OpenSim.Framework.Console"/> |
1190 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1188 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1191 | <Reference name="OpenSim.Services.Interfaces"/> | 1189 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -1217,7 +1215,6 @@ | |||
1217 | <Reference name="System"/> | 1215 | <Reference name="System"/> |
1218 | <Reference name="System.Core"/> | 1216 | <Reference name="System.Core"/> |
1219 | <Reference name="OpenSim.Framework"/> | 1217 | <Reference name="OpenSim.Framework"/> |
1220 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1221 | <Reference name="OpenSim.Framework.Console"/> | 1218 | <Reference name="OpenSim.Framework.Console"/> |
1222 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1219 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1223 | <Reference name="OpenSim.Services.Interfaces"/> | 1220 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -1271,7 +1268,6 @@ | |||
1271 | </Files> | 1268 | </Files> |
1272 | </Project> | 1269 | </Project> |
1273 | 1270 | ||
1274 | |||
1275 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> | 1271 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers" path="OpenSim/Server/Handlers" type="Library"> |
1276 | <Configuration name="Debug"> | 1272 | <Configuration name="Debug"> |
1277 | <Options> | 1273 | <Options> |
@@ -1310,6 +1306,46 @@ | |||
1310 | </Project> | 1306 | </Project> |
1311 | 1307 | ||
1312 | 1308 | ||
1309 | <Project frameworkVersion="v3_5" name="OpenSim.Capabilities.Handlers" path="OpenSim/Capabilities/Handlers" type="Library"> | ||
1310 | <Configuration name="Debug"> | ||
1311 | <Options> | ||
1312 | <OutputPath>../../../bin/</OutputPath> | ||
1313 | </Options> | ||
1314 | </Configuration> | ||
1315 | <Configuration name="Release"> | ||
1316 | <Options> | ||
1317 | <OutputPath>../../../bin/</OutputPath> | ||
1318 | </Options> | ||
1319 | </Configuration> | ||
1320 | |||
1321 | <ReferencePath>../../../bin/</ReferencePath> | ||
1322 | <Reference name="System"/> | ||
1323 | <Reference name="System.Drawing"/> | ||
1324 | <Reference name="System.Xml"/> | ||
1325 | <Reference name="System.Web"/> | ||
1326 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
1327 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
1328 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
1329 | <Reference name="OpenSim.Capabilities"/> | ||
1330 | <Reference name="OpenSim.Framework"/> | ||
1331 | <Reference name="OpenSim.Framework.Console"/> | ||
1332 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1333 | <Reference name="OpenSim.Server.Base"/> | ||
1334 | <Reference name="OpenSim.Server.Handlers"/> | ||
1335 | <Reference name="OpenSim.Services.Base"/> | ||
1336 | <Reference name="OpenSim.Services.Interfaces"/> | ||
1337 | <Reference name="Nini" path="../../../bin/"/> | ||
1338 | <Reference name="log4net" path="../../../bin/"/> | ||
1339 | <Reference name="DotNetOpenId" path="../../../bin/"/> | ||
1340 | |||
1341 | <Files> | ||
1342 | <Match pattern="*.cs" recurse="true"> | ||
1343 | <Exclude pattern="Tests"/> | ||
1344 | </Match> | ||
1345 | </Files> | ||
1346 | </Project> | ||
1347 | |||
1348 | |||
1313 | <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe"> | 1349 | <Project frameworkVersion="v3_5" name="Robust" path="OpenSim/Server" type="Exe"> |
1314 | <Configuration name="Debug"> | 1350 | <Configuration name="Debug"> |
1315 | <Options> | 1351 | <Options> |
@@ -1402,8 +1438,8 @@ | |||
1402 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1438 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
1403 | <Reference name="CSJ2K" path="../../../bin/"/> | 1439 | <Reference name="CSJ2K" path="../../../bin/"/> |
1404 | <Reference name="Warp3D" path="../../../bin/" localCopy="true"/> | 1440 | <Reference name="Warp3D" path="../../../bin/" localCopy="true"/> |
1441 | <Reference name="OpenSim.Capabilities"/> | ||
1405 | <Reference name="OpenSim.Framework"/> | 1442 | <Reference name="OpenSim.Framework"/> |
1406 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1407 | <Reference name="OpenSim.Framework.Communications"/> | 1443 | <Reference name="OpenSim.Framework.Communications"/> |
1408 | <Reference name="OpenSim.Data"/> | 1444 | <Reference name="OpenSim.Data"/> |
1409 | <Reference name="OpenSim.Region.Framework"/> | 1445 | <Reference name="OpenSim.Region.Framework"/> |
@@ -1513,7 +1549,7 @@ | |||
1513 | </Project> | 1549 | </Project> |
1514 | 1550 | ||
1515 | <!-- ClientStack Plugins --> | 1551 | <!-- ClientStack Plugins --> |
1516 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP" path="OpenSim/Region/ClientStack/LindenUDP" type="Library"> | 1552 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.Linden" path="OpenSim/Region/ClientStack/Linden" type="Library"> |
1517 | <Configuration name="Debug"> | 1553 | <Configuration name="Debug"> |
1518 | <Options> | 1554 | <Options> |
1519 | <OutputPath>../../../../bin/</OutputPath> | 1555 | <OutputPath>../../../../bin/</OutputPath> |
@@ -1528,28 +1564,35 @@ | |||
1528 | <ReferencePath>../../../../bin/</ReferencePath> | 1564 | <ReferencePath>../../../../bin/</ReferencePath> |
1529 | <Reference name="System"/> | 1565 | <Reference name="System"/> |
1530 | <Reference name="System.Core"/> | 1566 | <Reference name="System.Core"/> |
1567 | <Reference name="System.Drawing"/> | ||
1531 | <Reference name="System.Xml"/> | 1568 | <Reference name="System.Xml"/> |
1569 | <Reference name="System.Web"/> | ||
1532 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 1570 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> |
1533 | <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> | 1571 | <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> |
1534 | <Reference name="OpenMetaverse" path="../../../../bin/"/> | 1572 | <Reference name="OpenMetaverse" path="../../../../bin/"/> |
1535 | <Reference name="OpenSim.Region.Framework"/> | 1573 | <Reference name="OpenSim.Region.Framework"/> |
1574 | <Reference name="OpenSim.Capabilities"/> | ||
1575 | <Reference name="OpenSim.Capabilities.Handlers"/> | ||
1536 | <Reference name="OpenSim.Framework"/> | 1576 | <Reference name="OpenSim.Framework"/> |
1537 | <Reference name="OpenSim.Data"/> | 1577 | <Reference name="OpenSim.Data"/> |
1538 | <Reference name="OpenSim.Framework.Servers"/> | 1578 | <Reference name="OpenSim.Framework.Servers"/> |
1579 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
1539 | <Reference name="OpenSim.Framework.Console"/> | 1580 | <Reference name="OpenSim.Framework.Console"/> |
1540 | <Reference name="OpenSim.Framework.Communications"/> | 1581 | <Reference name="OpenSim.Framework.Communications"/> |
1541 | <Reference name="OpenSim.Framework.Statistics"/> | 1582 | <Reference name="OpenSim.Framework.Statistics"/> |
1542 | <Reference name="OpenSim.Region.ClientStack"/> | 1583 | <Reference name="OpenSim.Region.ClientStack"/> |
1543 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1584 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1544 | <Reference name="OpenSim.Services.Interfaces"/> | 1585 | <Reference name="OpenSim.Services.Interfaces"/> |
1545 | <Reference name="XMLRPC" path="../../../../bin/"/> | 1586 | <Reference name="Mono.Addins" path="../../../bin/"/> |
1546 | <Reference name="Nini" path="../../../../bin/"/> | 1587 | <Reference name="Nini" path="../../../../bin/"/> |
1547 | <Reference name="log4net" path="../../../../bin/"/> | 1588 | <Reference name="log4net" path="../../../../bin/"/> |
1548 | <Reference name="C5" path="../../../../bin/"/> | 1589 | <Reference name="C5" path="../../../../bin/"/> |
1549 | <Reference name="Nini" path="../../../../bin/"/> | 1590 | <Reference name="Nini" path="../../../../bin/"/> |
1550 | 1591 | ||
1551 | <Files> | 1592 | <Files> |
1552 | <Match pattern="*.cs" recurse="false"/> | 1593 | <Match pattern="*.cs" recurse="true"> |
1594 | <Exclude name="Tests" pattern="Tests"/> | ||
1595 | </Match> | ||
1553 | </Files> | 1596 | </Files> |
1554 | </Project> | 1597 | </Project> |
1555 | 1598 | ||
@@ -1574,16 +1617,16 @@ | |||
1574 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 1617 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
1575 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1618 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
1576 | <Reference name="PumaCode.SvnDotNet" path="../../../bin/"/> | 1619 | <Reference name="PumaCode.SvnDotNet" path="../../../bin/"/> |
1620 | <Reference name="OpenSim.Capabilities"/> | ||
1577 | <Reference name="OpenSim.Framework"/> | 1621 | <Reference name="OpenSim.Framework"/> |
1578 | <Reference name="OpenSim.Framework.Communications"/> | 1622 | <Reference name="OpenSim.Framework.Communications"/> |
1579 | <Reference name="OpenSim.Data"/> | 1623 | <Reference name="OpenSim.Data"/> |
1580 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1581 | <Reference name="OpenSim.Framework.Console"/> | 1624 | <Reference name="OpenSim.Framework.Console"/> |
1582 | <Reference name="OpenSim.Framework.Servers"/> | 1625 | <Reference name="OpenSim.Framework.Servers"/> |
1583 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1626 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1584 | <Reference name="OpenSim.Framework.Statistics"/> | 1627 | <Reference name="OpenSim.Framework.Statistics"/> |
1585 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | ||
1586 | <Reference name="OpenSim.Region.CoreModules"/> | 1628 | <Reference name="OpenSim.Region.CoreModules"/> |
1629 | <Reference name="OpenSim.Region.ClientStack.Linden"/> | ||
1587 | <Reference name="OpenSim.Region.Framework"/> | 1630 | <Reference name="OpenSim.Region.Framework"/> |
1588 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1631 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1589 | <Reference name="OpenSim.Server.Base"/> | 1632 | <Reference name="OpenSim.Server.Base"/> |
@@ -1914,8 +1957,8 @@ | |||
1914 | <Reference name="System"/> | 1957 | <Reference name="System"/> |
1915 | <Reference name="System.Xml"/> | 1958 | <Reference name="System.Xml"/> |
1916 | <Reference name="System.Data"/> | 1959 | <Reference name="System.Data"/> |
1960 | <Reference name="OpenSim.Capabilities"/> | ||
1917 | <Reference name="OpenSim.Framework"/> | 1961 | <Reference name="OpenSim.Framework"/> |
1918 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
1919 | <Reference name="OpenSim.Framework.Communications"/> | 1962 | <Reference name="OpenSim.Framework.Communications"/> |
1920 | <Reference name="OpenSim.Framework.Console"/> | 1963 | <Reference name="OpenSim.Framework.Console"/> |
1921 | <Reference name="OpenSim.Framework.Servers"/> | 1964 | <Reference name="OpenSim.Framework.Servers"/> |
@@ -2346,13 +2389,13 @@ | |||
2346 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 2389 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
2347 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 2390 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
2348 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 2391 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
2392 | <Reference name="OpenSim.Capabilities"/> | ||
2349 | <Reference name="OpenSim.Framework"/> | 2393 | <Reference name="OpenSim.Framework"/> |
2350 | <Reference name="OpenSim.Data"/> | 2394 | <Reference name="OpenSim.Data"/> |
2351 | <Reference name="OpenSim.Region.Framework"/> | 2395 | <Reference name="OpenSim.Region.Framework"/> |
2352 | <Reference name="OpenSim.Region.CoreModules"/> | 2396 | <Reference name="OpenSim.Region.CoreModules"/> |
2353 | <Reference name="OpenSim.Framework.Console"/> | 2397 | <Reference name="OpenSim.Framework.Console"/> |
2354 | <Reference name="OpenSim.Framework.Servers"/> | 2398 | <Reference name="OpenSim.Framework.Servers"/> |
2355 | <Reference name="OpenSim.Framework.Capabilities"/> | ||
2356 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2399 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
2357 | <Reference name="OpenSim.Framework.Statistics"/> | 2400 | <Reference name="OpenSim.Framework.Statistics"/> |
2358 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2401 | <Reference name="OpenSim.Region.Physics.Manager"/> |