From a1a8b5f4a715f97348da75a2644ff8215e18782f Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 14 Nov 2018 13:12:25 +0000 Subject: replace RemoteParcelRequest response encoding ( runprebuild needed) --- OpenSim/Capabilities/LLSDRemoteParcelResponse.cs | 42 ---------------------- .../CoreModules/World/Land/LandManagementModule.cs | 9 ++--- 2 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 OpenSim/Capabilities/LLSDRemoteParcelResponse.cs 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 @@ -/* -* Copyright (c) Contributors, http://opensimulator.org/ -* See CONTRIBUTORS.TXT for a full list of copyright holders. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* * Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* * Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the distribution. -* * Neither the name of the OpenSimulator Project nor the -* names of its contributors may be used to endorse or promote products -* derived from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY -* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY -* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*/ - -using OpenMetaverse; - -namespace OpenSim.Framework.Capabilities -{ - [LLSDType("MAP")] - public class LLSDRemoteParcelResponse - { - public UUID parcel_id; - - public LLSDRemoteParcelResponse() - { - } - } -} 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 m_log.ErrorFormat("[LAND MANAGEMENT MODULE]: Wrong type in request {0}", request); } - LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse(); - response.parcel_id = parcelID; //m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID); - - return LLSDHelpers.SerialiseLLSDReply(response); + StringBuilder sb = LLSDxmlEncode.Start(); + LLSDxmlEncode.AddMap(sb); + LLSDxmlEncode.AddElem("parcel_id", parcelID,sb); + LLSDxmlEncode.AddEndMap(sb); + return LLSDxmlEncode.End(sb); } #endregion -- cgit v1.1