aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-11-14 13:12:25 +0000
committerUbitUmarov2018-11-14 13:12:25 +0000
commita1a8b5f4a715f97348da75a2644ff8215e18782f (patch)
tree2df59fb58975929dce440ebfd43828c81c207515
parentsome cleaup (diff)
downloadopensim-SC-a1a8b5f4a715f97348da75a2644ff8215e18782f.zip
opensim-SC-a1a8b5f4a715f97348da75a2644ff8215e18782f.tar.gz
opensim-SC-a1a8b5f4a715f97348da75a2644ff8215e18782f.tar.bz2
opensim-SC-a1a8b5f4a715f97348da75a2644ff8215e18782f.tar.xz
replace RemoteParcelRequest response encoding ( runprebuild needed)
-rw-r--r--OpenSim/Capabilities/LLSDRemoteParcelResponse.cs42
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs9
2 files changed, 5 insertions, 46 deletions
diff --git a/OpenSim/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Capabilities/LLSDRemoteParcelResponse.cs
deleted file mode 100644
index 13d69d3..0000000
--- a/OpenSim/Capabilities/LLSDRemoteParcelResponse.cs
+++ /dev/null
@@ -1,42 +0,0 @@
1/*
2* Copyright (c) Contributors, http://opensimulator.org/
3* See CONTRIBUTORS.TXT for a full list of copyright holders.
4*
5* Redistribution and use in source and binary forms, with or without
6* modification, are permitted provided that the following conditions are met:
7* * Redistributions of source code must retain the above copyright
8* notice, this list of conditions and the following disclaimer.
9* * Redistributions in binary form must reproduce the above copyright
10* notice, this list of conditions and the following disclaimer in the
11* documentation and/or other materials provided with the distribution.
12* * Neither the name of the OpenSimulator Project nor the
13* names of its contributors may be used to endorse or promote products
14* derived from this software without specific prior written permission.
15*
16* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26*
27*/
28
29using OpenMetaverse;
30
31namespace OpenSim.Framework.Capabilities
32{
33 [LLSDType("MAP")]
34 public class LLSDRemoteParcelResponse
35 {
36 public UUID parcel_id;
37
38 public LLSDRemoteParcelResponse()
39 {
40 }
41 }
42}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 854c833..ebfc58c 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -2031,11 +2031,12 @@ namespace OpenSim.Region.CoreModules.World.Land
2031 m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: Wrong type in request {0}", request); 2031 m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: Wrong type in request {0}", request);
2032 } 2032 }
2033 2033
2034 LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse();
2035 response.parcel_id = parcelID;
2036 //m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID); 2034 //m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID);
2037 2035 StringBuilder sb = LLSDxmlEncode.Start();
2038 return LLSDHelpers.SerialiseLLSDReply(response); 2036 LLSDxmlEncode.AddMap(sb);
2037 LLSDxmlEncode.AddElem("parcel_id", parcelID,sb);
2038 LLSDxmlEncode.AddEndMap(sb);
2039 return LLSDxmlEncode.End(sb);
2039 } 2040 }
2040 2041
2041 #endregion 2042 #endregion