diff options
| author | Melanie | 2013-02-22 01:28:54 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-22 01:28:54 +0000 |
| commit | 9534d5f9296979b68550177a5201c2bdba84f14e (patch) | |
| tree | 1d39dee6d1eaed10b1146a9ee59a6deaa062bae2 /OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-9534d5f9296979b68550177a5201c2bdba84f14e.zip opensim-SC_OLD-9534d5f9296979b68550177a5201c2bdba84f14e.tar.gz opensim-SC_OLD-9534d5f9296979b68550177a5201c2bdba84f14e.tar.bz2 opensim-SC_OLD-9534d5f9296979b68550177a5201c2bdba84f14e.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index d7d4708..9b945f4 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -1445,7 +1445,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 1445 | string param, IOSHttpRequest httpRequest, | 1445 | string param, IOSHttpRequest httpRequest, |
| 1446 | IOSHttpResponse httpResponse) | 1446 | IOSHttpResponse httpResponse) |
| 1447 | { | 1447 | { |
| 1448 | OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); | 1448 | // OSDMap req = (OSDMap)OSDParser.DeserializeLLSDXml(request); |
| 1449 | OSDMap resp = new OSDMap(); | 1449 | OSDMap resp = new OSDMap(); |
| 1450 | 1450 | ||
| 1451 | OSDMap accessPrefs = new OSDMap(); | 1451 | OSDMap accessPrefs = new OSDMap(); |