diff options
author | Diva Canto | 2011-05-02 11:56:40 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-02 11:56:40 -0700 |
commit | aba9ffdbd008920f94cfbd7d4ff4a0fa92e92321 (patch) | |
tree | 2b5f6db1fcdb88e7492ba9d698dc45c844534cf3 /OpenSim/Region/ClientStack/Linden | |
parent | Works! (diff) | |
download | opensim-SC_OLD-aba9ffdbd008920f94cfbd7d4ff4a0fa92e92321.zip opensim-SC_OLD-aba9ffdbd008920f94cfbd7d4ff4a0fa92e92321.tar.gz opensim-SC_OLD-aba9ffdbd008920f94cfbd7d4ff4a0fa92e92321.tar.bz2 opensim-SC_OLD-aba9ffdbd008920f94cfbd7d4ff4a0fa92e92321.tar.xz |
Refactored the GetMesh module into a handler and a module, to be the same as GetTexture.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs | 151 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 2 |
2 files changed, 40 insertions, 113 deletions
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; | |||
36 | using Nini.Config; | 36 | using Nini.Config; |
37 | using OpenMetaverse; | 37 | using OpenMetaverse; |
38 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
39 | using OpenSim.Capabilities.Handlers; | ||
39 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Servers; | 41 | using OpenSim.Framework.Servers; |
41 | using OpenSim.Framework.Servers.HttpServer; | 42 | using 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) |