diff options
author | Melanie | 2013-01-08 22:52:14 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-25 23:47:58 +0000 |
commit | 17d54a7c37c398d9bdde232c472770e50e20076d (patch) | |
tree | 6a138383f6f31f23bb8e3984eaca89dd121c51e3 /OpenSim/Region/ClientStack | |
parent | Flip version to 0.7.5.RC1 (diff) | |
download | opensim-SC-17d54a7c37c398d9bdde232c472770e50e20076d.zip opensim-SC-17d54a7c37c398d9bdde232c472770e50e20076d.tar.gz opensim-SC-17d54a7c37c398d9bdde232c472770e50e20076d.tar.bz2 opensim-SC-17d54a7c37c398d9bdde232c472770e50e20076d.tar.xz |
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
work.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index cc69645..a534522 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -96,8 +96,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
96 | // private static readonly string m_fetchInventoryPath = "0006/"; | 96 | // private static readonly string m_fetchInventoryPath = "0006/"; |
97 | private static readonly string m_copyFromNotecardPath = "0007/"; | 97 | private static readonly string m_copyFromNotecardPath = "0007/"; |
98 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. | 98 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. |
99 | 99 | private static readonly string m_UpdateAgentInformationPath = "0500/"; | |
100 | 100 | ||
101 | // These are callbacks which will be setup by the scene so that we can update scene data when we | 101 | // These are callbacks which will be setup by the scene so that we can update scene data when we |
102 | // receive capability calls | 102 | // receive capability calls |
103 | public NewInventoryItem AddNewInventoryItem = null; | 103 | public NewInventoryItem AddNewInventoryItem = null; |
@@ -204,6 +204,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
204 | m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); | 204 | m_HostCapsObj.RegisterHandler("UpdateNotecardAgentInventory", req); |
205 | m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); | 205 | m_HostCapsObj.RegisterHandler("UpdateScriptAgentInventory", req); |
206 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); | 206 | m_HostCapsObj.RegisterHandler("UpdateScriptAgent", req); |
207 | IRequestHandler UpdateAgentInformationHandler = new RestStreamHandler("POST", capsBase + m_UpdateAgentInformationPath, UpdateAgentInformation); | ||
208 | m_HostCapsObj.RegisterHandler("UpdateAgentInformation", UpdateAgentInformationHandler); | ||
207 | 209 | ||
208 | m_HostCapsObj.RegisterHandler( | 210 | m_HostCapsObj.RegisterHandler( |
209 | "CopyInventoryFromNotecard", | 211 | "CopyInventoryFromNotecard", |
@@ -855,6 +857,22 @@ namespace OpenSim.Region.ClientStack.Linden | |||
855 | response["int_response_code"] = 200; | 857 | response["int_response_code"] = 200; |
856 | return LLSDHelpers.SerialiseLLSDReply(response); | 858 | return LLSDHelpers.SerialiseLLSDReply(response); |
857 | } | 859 | } |
860 | |||
861 | public string UpdateAgentInformation(string request, string path, | ||
862 | string param, IOSHttpRequest httpRequest, | ||
863 | IOSHttpResponse httpResponse) | ||
864 | { | ||
865 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | ||
866 | OSDMap resp = new OSDMap(); | ||
867 | |||
868 | OSDMap accessPrefs = new OSDMap(); | ||
869 | accessPrefs["max"] = "A"; | ||
870 | |||
871 | resp["access_prefs"] = accessPrefs; | ||
872 | |||
873 | string response = OSDParser.SerializeLLSDXmlString(resp); | ||
874 | return response; | ||
875 | } | ||
858 | } | 876 | } |
859 | 877 | ||
860 | public class AssetUploader | 878 | public class AssetUploader |