diff options
| author | UbitUmarov | 2016-12-09 04:50:07 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-09 04:50:07 +0000 |
| commit | 8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da (patch) | |
| tree | ca6a6e9200e4c1cd69104ce405338ee54dde2de3 /OpenSim/Region | |
| parent | provide remote SSLcommonName to xmlRpcRequest methods, but in a away it can b... (diff) | |
| parent | JsonRpc: don't try to connect to a empty uri (diff) | |
| download | opensim-SC-8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da.zip opensim-SC-8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da.tar.gz opensim-SC-8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da.tar.bz2 opensim-SC-8114ff9d065e37f3301b3fb4ac4a9f4e7121e8da.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -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 032104d..6873325 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -1675,7 +1675,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 1675 | if(fail) | 1675 | if(fail) |
| 1676 | { | 1676 | { |
| 1677 | if(client != null) | 1677 | if(client != null) |
| 1678 | client.SendAlertMessage(message, "HomePositionSet"); | 1678 | client.SendAlertMessage(message); |
| 1679 | response = OSDParser.SerializeLLSDXmlString(resp); | 1679 | response = OSDParser.SerializeLLSDXmlString(resp); |
| 1680 | return response; | 1680 | return response; |
| 1681 | } | 1681 | } |