diff options
author | UbitUmarov | 2018-11-14 16:23:14 +0000 |
---|---|---|
committer | UbitUmarov | 2018-11-14 16:23:14 +0000 |
commit | b48cbcbfdda1bf348a77554958bebea33560dbe6 (patch) | |
tree | 37aa567ef790dd0af446095e370c76f7d741b513 /OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps | |
parent | replace Enviroment response encoding ( runprebuild needed) (diff) | |
download | opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.zip opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.gz opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.bz2 opensim-SC-b48cbcbfdda1bf348a77554958bebea33560dbe6.tar.xz |
simplify a bit some caps paths
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs index b044e56..adb49bd 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/ObjectAdd.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
93 | 93 | ||
94 | public void RegisterCaps(UUID agentID, Caps caps) | 94 | public void RegisterCaps(UUID agentID, Caps caps) |
95 | { | 95 | { |
96 | UUID capuuid = UUID.Random(); | 96 | string capUrl = "/CAPS/" + UUID.Random() + "/"; |
97 | 97 | ||
98 | // m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/"); | 98 | // m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/"); |
99 | 99 | ||
@@ -101,7 +101,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
101 | "ObjectAdd", | 101 | "ObjectAdd", |
102 | new RestHTTPHandler( | 102 | new RestHTTPHandler( |
103 | "POST", | 103 | "POST", |
104 | "/CAPS/OA/" + capuuid + "/", | 104 | capUrl, |
105 | httpMethod => ProcessAdd(httpMethod, agentID, caps), | 105 | httpMethod => ProcessAdd(httpMethod, agentID, caps), |
106 | "ObjectAdd", | 106 | "ObjectAdd", |
107 | agentID.ToString())); ; | 107 | agentID.ToString())); ; |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index 116c51f..04d11cb 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
@@ -103,14 +103,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
103 | 103 | ||
104 | public void RegisterCaps(UUID agentID, Caps caps) | 104 | public void RegisterCaps(UUID agentID, Caps caps) |
105 | { | 105 | { |
106 | UUID capID = UUID.Random(); | 106 | string capUrl = "/CAPS/" + UUID.Random() + "/"; |
107 | 107 | ||
108 | // m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID); | 108 | // m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID); |
109 | caps.RegisterHandler( | 109 | caps.RegisterHandler( |
110 | "UploadObjectAsset", | 110 | "UploadObjectAsset", |
111 | new RestHTTPHandler( | 111 | new RestHTTPHandler( |
112 | "POST", | 112 | "POST", |
113 | "/CAPS/OA/" + capID + "/", | 113 | capUrl, |
114 | httpMethod => ProcessAdd(httpMethod, agentID, caps), | 114 | httpMethod => ProcessAdd(httpMethod, agentID, caps), |
115 | "UploadObjectAsset", | 115 | "UploadObjectAsset", |
116 | agentID.ToString())); | 116 | agentID.ToString())); |