diff options
| author | Melanie | 2012-05-05 10:32:04 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-05 10:32:04 +0100 |
| commit | 31ab8b2fe0683cbc9fa4503c616722d678b66e33 (patch) | |
| tree | 34fefd4bf9db7eea797db49e75aaaac5080ea94b /OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | |
| parent | Merge branch 'avination' (diff) | |
| parent | Fire the scripting changed event with CHANGED_OWNER when an object that has c... (diff) | |
| download | opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.zip opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.gz opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.bz2 opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs index 2ecfa3c..8a275f3 100644 --- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs +++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | |||
| @@ -66,13 +66,14 @@ namespace OpenSim.Capabilities.Handlers | |||
| 66 | throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); | 66 | throw new Exception(String.Format("Failed to load AssetService from {0}; config is {1}", assetService, m_ConfigName)); |
| 67 | 67 | ||
| 68 | GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService); | 68 | GetMeshHandler gmeshHandler = new GetMeshHandler(m_AssetService); |
| 69 | IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), | 69 | IRequestHandler reqHandler |
| 70 | delegate(Hashtable m_dhttpMethod) | 70 | = new RestHTTPHandler( |
| 71 | { | 71 | "GET", |
| 72 | return gmeshHandler.ProcessGetMesh(m_dhttpMethod, UUID.Zero, null); | 72 | "/CAPS/" + UUID.Random(), |
| 73 | }); | 73 | httpMethod => gmeshHandler.ProcessGetMesh(httpMethod, UUID.Zero, null), |
| 74 | "GetMesh", | ||
| 75 | null); | ||
| 74 | server.AddStreamHandler(reqHandler); | 76 | server.AddStreamHandler(reqHandler); |
| 75 | } | 77 | } |
| 76 | |||
| 77 | } | 78 | } |
| 78 | } | 79 | } \ No newline at end of file |