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/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.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 '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs index 18c7eae..44a6883 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | |||
| @@ -117,7 +117,9 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 117 | 117 | ||
| 118 | public void RegisterCaps(UUID agentID, Caps caps) | 118 | public void RegisterCaps(UUID agentID, Caps caps) |
| 119 | { | 119 | { |
| 120 | IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag); | 120 | IRequestHandler reqHandler |
| 121 | = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag, "MeshUploadFlag", agentID.ToString()); | ||
| 122 | |||
| 121 | caps.RegisterHandler("MeshUploadFlag", reqHandler); | 123 | caps.RegisterHandler("MeshUploadFlag", reqHandler); |
| 122 | m_agentID = agentID; | 124 | m_agentID = agentID; |
| 123 | } | 125 | } |