aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-29 07:21:37 +0300
committerOren Hurvitz2014-04-29 07:59:10 +0100
commit06e4fcd260fb9ef7aff95ca660d0a2d385335d4f (patch)
tree40acd7008218033ad5d6abe7a2647ea3b9e5f835
parentBulletSim: non-functional changes to debugging statements and formatting. (diff)
downloadopensim-SC_OLD-06e4fcd260fb9ef7aff95ca660d0a2d385335d4f.zip
opensim-SC_OLD-06e4fcd260fb9ef7aff95ca660d0a2d385335d4f.tar.gz
opensim-SC_OLD-06e4fcd260fb9ef7aff95ca660d0a2d385335d4f.tar.bz2
opensim-SC_OLD-06e4fcd260fb9ef7aff95ca660d0a2d385335d4f.tar.xz
Fixed the UpdateAgentInformation CAP: the viewer expects the simulator to echo back the maturity that it sent
Without this change, attempts to change the maturity rating in the viewer's Preferences don't work.
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index a4fe81c..79bc5ef 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -923,13 +923,14 @@ namespace OpenSim.Region.ClientStack.Linden
923 string param, IOSHttpRequest httpRequest, 923 string param, IOSHttpRequest httpRequest,
924 IOSHttpResponse httpResponse) 924 IOSHttpResponse httpResponse)
925 { 925 {
926// OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); 926 OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request);
927 OSDMap resp = new OSDMap(); 927 OSDMap accessPrefs = (OSDMap)req["access_prefs"];
928 928 string desiredMaturity = accessPrefs["max"];
929 OSDMap accessPrefs = new OSDMap();
930 accessPrefs["max"] = "A";
931 929
932 resp["access_prefs"] = accessPrefs; 930 OSDMap resp = new OSDMap();
931 OSDMap respAccessPrefs = new OSDMap();
932 respAccessPrefs["max"] = desiredMaturity; // echoing the maturity back means success
933 resp["access_prefs"] = respAccessPrefs;
933 934
934 string response = OSDParser.SerializeLLSDXmlString(resp); 935 string response = OSDParser.SerializeLLSDXmlString(resp);
935 return response; 936 return response;