aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs143
-rw-r--r--OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs79
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs (renamed from OpenSim/Capabilities/Handlers/GetTextureHandler.cs)0
-rw-r--r--OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs (renamed from OpenSim/Capabilities/Handlers/GetTextureServerConnector.cs)0
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs151
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs2
6 files changed, 262 insertions, 113 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
new file mode 100644
index 0000000..c60abb1
--- /dev/null
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
@@ -0,0 +1,143 @@
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
28using System;
29using System.Collections;
30using System.Collections.Specialized;
31using System.Reflection;
32using System.IO;
33using System.Web;
34using log4net;
35using Nini.Config;
36using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using OpenSim.Framework;
39using OpenSim.Framework.Servers;
40using OpenSim.Framework.Servers.HttpServer;
41using OpenSim.Services.Interfaces;
42using Caps = OpenSim.Framework.Capabilities.Caps;
43
44namespace OpenSim.Capabilities.Handlers
45{
46 public class GetMeshHandler
47 {
48// private static readonly ILog m_log =
49// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50
51 private IAssetService m_assetService;
52
53 public GetMeshHandler(IAssetService assService)
54 {
55 m_assetService = assService;
56 }
57
58 public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
59 {
60
61 Hashtable responsedata = new Hashtable();
62 responsedata["int_response_code"] = 400; //501; //410; //404;
63 responsedata["content_type"] = "text/plain";
64 responsedata["keepalive"] = false;
65 responsedata["str_response_string"] = "Request wasn't what was expected";
66
67 string meshStr = string.Empty;
68
69 if (request.ContainsKey("mesh_id"))
70 meshStr = request["mesh_id"].ToString();
71
72
73 UUID meshID = UUID.Zero;
74 if (!String.IsNullOrEmpty(meshStr) && UUID.TryParse(meshStr, out meshID))
75 {
76 if (m_assetService == null)
77 {
78 responsedata["int_response_code"] = 404; //501; //410; //404;
79 responsedata["content_type"] = "text/plain";
80 responsedata["keepalive"] = false;
81 responsedata["str_response_string"] = "The asset service is unavailable. So is your mesh.";
82 return responsedata;
83 }
84
85 AssetBase mesh;
86 // Only try to fetch locally cached textures. Misses are redirected
87 mesh = m_assetService.GetCached(meshID.ToString());
88 if (mesh != null)
89 {
90 if (mesh.Type == (SByte)AssetType.Mesh)
91 {
92 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
93 responsedata["content_type"] = "application/vnd.ll.mesh";
94 responsedata["int_response_code"] = 200;
95 }
96 // Optionally add additional mesh types here
97 else
98 {
99 responsedata["int_response_code"] = 404; //501; //410; //404;
100 responsedata["content_type"] = "text/plain";
101 responsedata["keepalive"] = false;
102 responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
103 return responsedata;
104 }
105 }
106 else
107 {
108 mesh = m_assetService.Get(meshID.ToString());
109 if (mesh != null)
110 {
111 if (mesh.Type == (SByte)AssetType.Mesh)
112 {
113 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
114 responsedata["content_type"] = "application/vnd.ll.mesh";
115 responsedata["int_response_code"] = 200;
116 }
117 // Optionally add additional mesh types here
118 else
119 {
120 responsedata["int_response_code"] = 404; //501; //410; //404;
121 responsedata["content_type"] = "text/plain";
122 responsedata["keepalive"] = false;
123 responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
124 return responsedata;
125 }
126 }
127
128 else
129 {
130 responsedata["int_response_code"] = 404; //501; //410; //404;
131 responsedata["content_type"] = "text/plain";
132 responsedata["keepalive"] = false;
133 responsedata["str_response_string"] = "Your Mesh wasn't found. Sorry!";
134 return responsedata;
135 }
136 }
137
138 }
139
140 return responsedata;
141 }
142 }
143}
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
new file mode 100644
index 0000000..fa5f755
--- /dev/null
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
@@ -0,0 +1,79 @@
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
28using System;
29using System.Collections;
30using Nini.Config;
31using OpenSim.Server.Base;
32using OpenSim.Services.Interfaces;
33using OpenSim.Framework.Servers.HttpServer;
34using OpenSim.Server.Handlers.Base;
35using OpenSim.Framework.Servers;
36using OpenSim.Framework.Servers.HttpServer;
37
38using OpenMetaverse;
39
40namespace OpenSim.Capabilities.Handlers
41{
42 public class GetMeshServerConnector : ServiceConnector
43 {
44 private IAssetService m_AssetService;
45 private string m_ConfigName = "CapsService";
46
47 public GetMeshServerConnector(IConfigSource config, IHttpServer server, string configName) :
48 base(config, server, configName)
49 {
50 if (configName != String.Empty)
51 m_ConfigName = configName;
52
53 IConfig serverConfig = config.Configs[m_ConfigName];
54 if (serverConfig == null)
55 throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
56
57 string assetService = serverConfig.GetString("AssetService", String.Empty);
58
59 if (assetService == String.Empty)
60 throw new Exception("No AssetService in config file");
61
62 Object[] args = new Object[] { config };
63 m_AssetService =
64 ServerUtils.LoadPlugin<IAssetService>(assetService, args);
65
66 if (m_AssetService == null)
67 throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName));
68
69 GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
70 IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
71 delegate(Hashtable m_dhttpMethod)
72 {
73 return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
74 });
75 server.AddStreamHandler(reqHandler);
76 }
77
78 }
79}
diff --git a/OpenSim/Capabilities/Handlers/GetTextureHandler.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
index 00ff3d0..00ff3d0 100644
--- a/OpenSim/Capabilities/Handlers/GetTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
diff --git a/OpenSim/Capabilities/Handlers/GetTextureServerConnector.cs b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
index 0335eac..0335eac 100644
--- a/OpenSim/Capabilities/Handlers/GetTextureServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetTexture/GetTextureServerConnector.cs
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 1d57143..f2f765c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -36,6 +36,7 @@ using log4net;
36using Nini.Config; 36using Nini.Config;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenMetaverse.StructuredData; 38using OpenMetaverse.StructuredData;
39using OpenSim.Capabilities.Handlers;
39using OpenSim.Framework; 40using OpenSim.Framework;
40using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
41using OpenSim.Framework.Servers.HttpServer; 42using OpenSim.Framework.Servers.HttpServer;
@@ -49,16 +50,16 @@ namespace OpenSim.Region.ClientStack.Linden
49 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] 50 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
50 public class GetMeshModule : INonSharedRegionModule 51 public class GetMeshModule : INonSharedRegionModule
51 { 52 {
52// private static readonly ILog m_log = 53 private static readonly ILog m_log =
53// LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 54 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
54 55
55 private Scene m_scene; 56 private Scene m_scene;
56 private IAssetService m_assetService; 57 private IAssetService m_AssetService;
57 private bool m_enabled = true; 58 private bool m_Enabled = true;
59 private string m_URL;
58 60
59 #region IRegionModuleBase Members 61 #region IRegionModuleBase Members
60 62
61
62 public Type ReplaceableInterface 63 public Type ReplaceableInterface
63 { 64 {
64 get { return null; } 65 get { return null; }
@@ -66,146 +67,70 @@ namespace OpenSim.Region.ClientStack.Linden
66 67
67 public void Initialise(IConfigSource source) 68 public void Initialise(IConfigSource source)
68 { 69 {
69 IConfig meshConfig = source.Configs["Mesh"]; 70 IConfig config = source.Configs["ClientStack.LindenCaps"];
70 if (meshConfig == null) 71 if (config == null)
71 return; 72 return;
72 73
73 m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true); 74 m_URL = config.GetString("Cap_GetMesh", string.Empty);
75 // Cap doesn't exist
76 if (m_URL != string.Empty)
77 m_Enabled = true;
74 } 78 }
75 79
76 public void AddRegion(Scene pScene) 80 public void AddRegion(Scene pScene)
77 { 81 {
82 if (!m_Enabled)
83 return;
84
78 m_scene = pScene; 85 m_scene = pScene;
79 } 86 }
80 87
81 public void RemoveRegion(Scene scene) 88 public void RemoveRegion(Scene scene)
82 { 89 {
83
84 m_scene.EventManager.OnRegisterCaps -= RegisterCaps; 90 m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
85 m_scene = null; 91 m_scene = null;
86 } 92 }
87 93
88 public void RegionLoaded(Scene scene) 94 public void RegionLoaded(Scene scene)
89 { 95 {
90 96 if (!m_Enabled)
91 m_assetService = m_scene.RequestModuleInterface<IAssetService>(); 97 return;
98
99 m_AssetService = m_scene.RequestModuleInterface<IAssetService>();
92 m_scene.EventManager.OnRegisterCaps += RegisterCaps; 100 m_scene.EventManager.OnRegisterCaps += RegisterCaps;
93 } 101 }
94 102
95 #endregion
96
97
98 #region IRegionModule Members
99
100
101 103
102 public void Close() { } 104 public void Close() { }
103 105
104 public string Name { get { return "GetMeshModule"; } } 106 public string Name { get { return "GetMeshModule"; } }
105 107
108 #endregion
109
106 110
107 public void RegisterCaps(UUID agentID, Caps caps) 111 public void RegisterCaps(UUID agentID, Caps caps)
108 { 112 {
109 if(!m_enabled)
110 return;
111
112 UUID capID = UUID.Random(); 113 UUID capID = UUID.Random();
113 114
114// m_log.Info("[GETMESH]: /CAPS/" + capID); 115 //caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
115 116 if (m_URL == "localhost")
116 caps.RegisterHandler("GetMesh",
117 new RestHTTPHandler("GET", "/CAPS/" + capID,
118 delegate(Hashtable m_dhttpMethod)
119 {
120 return ProcessGetMesh(m_dhttpMethod, agentID, caps);
121 }));
122 }
123
124 #endregion
125
126 public Hashtable ProcessGetMesh(Hashtable request, UUID AgentId, Caps cap)
127 {
128
129 Hashtable responsedata = new Hashtable();
130 responsedata["int_response_code"] = 400; //501; //410; //404;
131 responsedata["content_type"] = "text/plain";
132 responsedata["keepalive"] = false;
133 responsedata["str_response_string"] = "Request wasn't what was expected";
134
135 string meshStr = string.Empty;
136
137 if (request.ContainsKey("mesh_id"))
138 meshStr = request["mesh_id"].ToString();
139
140
141 UUID meshID = UUID.Zero;
142 if (!String.IsNullOrEmpty(meshStr) && UUID.TryParse(meshStr, out meshID))
143 { 117 {
144 if (m_assetService == null) 118 m_log.InfoFormat("[GETMESH]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
145 { 119 GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService);
146 responsedata["int_response_code"] = 404; //501; //410; //404; 120 IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(),
147 responsedata["content_type"] = "text/plain"; 121 delegate(Hashtable m_dhttpMethod)
148 responsedata["keepalive"] = false; 122 {
149 responsedata["str_response_string"] = "The asset service is unavailable. So is your mesh."; 123 return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null);
150 return responsedata; 124 });
151 } 125
152 126 caps.RegisterHandler("GetMesh", reqHandler);
153 AssetBase mesh; 127 }
154 // Only try to fetch locally cached textures. Misses are redirected 128 else
155 mesh = m_assetService.GetCached(meshID.ToString()); 129 {
156 if (mesh != null) 130 m_log.InfoFormat("[GETMESH]: {0} in region {1}", m_URL, m_scene.RegionInfo.RegionName);
157 { 131 caps.RegisterHandler("GetMesh", m_URL);
158 if (mesh.Type == (SByte)AssetType.Mesh)
159 {
160 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
161 responsedata["content_type"] = "application/vnd.ll.mesh";
162 responsedata["int_response_code"] = 200;
163 }
164 // Optionally add additional mesh types here
165 else
166 {
167 responsedata["int_response_code"] = 404; //501; //410; //404;
168 responsedata["content_type"] = "text/plain";
169 responsedata["keepalive"] = false;
170 responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
171 return responsedata;
172 }
173 }
174 else
175 {
176 mesh = m_assetService.Get(meshID.ToString());
177 if (mesh != null)
178 {
179 if (mesh.Type == (SByte)AssetType.Mesh)
180 {
181 responsedata["str_response_string"] = Convert.ToBase64String(mesh.Data);
182 responsedata["content_type"] = "application/vnd.ll.mesh";
183 responsedata["int_response_code"] = 200;
184 }
185 // Optionally add additional mesh types here
186 else
187 {
188 responsedata["int_response_code"] = 404; //501; //410; //404;
189 responsedata["content_type"] = "text/plain";
190 responsedata["keepalive"] = false;
191 responsedata["str_response_string"] = "Unfortunately, this asset isn't a mesh.";
192 return responsedata;
193 }
194 }
195
196 else
197 {
198 responsedata["int_response_code"] = 404; //501; //410; //404;
199 responsedata["content_type"] = "text/plain";
200 responsedata["keepalive"] = false;
201 responsedata["str_response_string"] = "Your Mesh wasn't found. Sorry!";
202 return responsedata;
203 }
204 }
205
206 } 132 }
207
208 return responsedata;
209 } 133 }
134
210 } 135 }
211} 136}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index d697f5e..564ef31 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -90,6 +90,8 @@ namespace OpenSim.Region.ClientStack.Linden
90 90
91 public void RemoveRegion(Scene s) 91 public void RemoveRegion(Scene s)
92 { 92 {
93 m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
94 m_scene = null;
93 } 95 }
94 96
95 public void RegionLoaded(Scene s) 97 public void RegionLoaded(Scene s)
generated by cgit v1.1 at 2024-11-10 09:02:00 +0000