From 5c3a4f52f4b4413832a6942aa75a21b157cd48dc Mon Sep 17 00:00:00 2001 From: mingchen Date: Mon, 11 Jun 2007 18:27:07 +0000 Subject: *Removed SimProfileBase from OpenSim (Unused/Depreciated) *Updated prebuild.xml --- .../OpenGrid.Framework.Communications.csproj | 57 ++++++-------- .../OpenGrid.Framework.Communications.dll.build | 16 ++-- Common/OpenSim.Framework/OpenSim.Framework.csproj | 92 +++++++++++----------- .../OpenSim.Framework/OpenSim.Framework.dll.build | 32 ++++---- Common/OpenSim.Framework/SimProfile.cs | 14 +++- Common/OpenSim.Framework/SimProfileBase.cs | 54 ------------- Common/OpenSim.Servers/OpenSim.Servers.csproj | 6 ++ Common/OpenSim.Servers/OpenSim.Servers.dll.build | 2 + Common/XmlRpcCS/XMLRPC.csproj | 36 ++++----- Common/XmlRpcCS/XMLRPC.dll.build | 22 +++--- 10 files changed, 143 insertions(+), 188 deletions(-) delete mode 100644 Common/OpenSim.Framework/SimProfileBase.cs (limited to 'Common') diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj index dcf09d9..b3fd574 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,8 +6,7 @@ {683344D5-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenGrid.Framework.Communications @@ -16,11 +15,9 @@ IE50 false Library - - + OpenGrid.Framework.Communications - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,19 +55,18 @@ False False 4 - - + - + System.dll False - + System.Xml.dll False - + ..\..\bin\libsecondlife.dll False @@ -83,50 +76,50 @@ OpenSim.Framework {8ACA2445-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False - + Code - + Code - + Code Code - + Code - + Code - + Code - + Code - + Code - + Code Code - + Code - + Code - + Code @@ -137,4 +130,4 @@ - \ No newline at end of file + diff --git a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build index 4036747..c46174c 100644 --- a/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build +++ b/Common/OpenGrid.Framework.Communications/OpenGrid.Framework.Communications.dll.build @@ -11,20 +11,20 @@ - + - + + + + + - + + - - - - - diff --git a/Common/OpenSim.Framework/OpenSim.Framework.csproj b/Common/OpenSim.Framework/OpenSim.Framework.csproj index 0da0982..9407a4f 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.csproj +++ b/Common/OpenSim.Framework/OpenSim.Framework.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,8 +6,7 @@ {8ACA2445-0000-0000-0000-000000000000} Debug AnyCPU - - + OpenSim.Framework @@ -16,11 +15,9 @@ IE50 false Library - - + OpenSim.Framework - - + @@ -31,8 +28,7 @@ TRACE;DEBUG - - + True 4096 False @@ -41,8 +37,7 @@ False False 4 - - + False @@ -51,8 +46,7 @@ TRACE - - + False 4096 True @@ -61,23 +55,22 @@ False False 4 - - + - + System.dll False - + System.Xml.dll False - + ..\..\bin\libsecondlife.dll False - + ..\..\bin\Db4objects.Db4o.dll False @@ -87,13 +80,13 @@ XMLRPC {8E81D43C-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False OpenSim.Framework.Console {A7CD0630-0000-0000-0000-000000000000} {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - False + False @@ -118,12 +111,6 @@ Code - - Code - - - Code - Code @@ -136,49 +123,55 @@ Code - + Code - + Code - + Code - + + Code + + Code Code + + Code + Code - + Code - + Code - + Code - + Code - + Code - + Code Code - + Code - + Code @@ -187,15 +180,24 @@ Code - + Code - + + Code + + Code Code + + Code + + + Code + Code @@ -211,9 +213,6 @@ Code - - Code - Code @@ -223,9 +222,6 @@ Code - - Code - Code @@ -240,4 +236,4 @@ - \ No newline at end of file + diff --git a/Common/OpenSim.Framework/OpenSim.Framework.dll.build b/Common/OpenSim.Framework/OpenSim.Framework.dll.build index 7ead9a8..dcbff12 100644 --- a/Common/OpenSim.Framework/OpenSim.Framework.dll.build +++ b/Common/OpenSim.Framework/OpenSim.Framework.dll.build @@ -18,43 +18,43 @@ - - + + + + + + + - - - - - - - - - + + + + - - + + + + + - - - diff --git a/Common/OpenSim.Framework/SimProfile.cs b/Common/OpenSim.Framework/SimProfile.cs index 2e37e02..cfa5e50 100644 --- a/Common/OpenSim.Framework/SimProfile.cs +++ b/Common/OpenSim.Framework/SimProfile.cs @@ -35,8 +35,20 @@ using Nwc.XmlRpc; namespace OpenSim.Framework.Sims { - public class SimProfile : SimProfileBase + public class SimProfile { + public LLUUID UUID; + public ulong regionhandle; + public string regionname; + public string sim_ip; + public uint sim_port; + public string caps_url; + public uint RegionLocX; + public uint RegionLocY; + public string sendkey; + public string recvkey; + public bool online; + public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey) { try diff --git a/Common/OpenSim.Framework/SimProfileBase.cs b/Common/OpenSim.Framework/SimProfileBase.cs deleted file mode 100644 index bab18be..0000000 --- a/Common/OpenSim.Framework/SimProfileBase.cs +++ /dev/null @@ -1,54 +0,0 @@ -/* -* Copyright (c) Contributors, http://www.openmetaverse.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 OpenSim 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 System; -using System.Collections.Generic; -using System.Text; -using libsecondlife; - -namespace OpenSim.Framework.Sims -{ - [System.Obsolete("Depreciated, use SimProfileData instead")] - public class SimProfileBase - { - public LLUUID UUID; - public ulong regionhandle; - public string regionname; - public string sim_ip; - public uint sim_port; - public string caps_url; - public uint RegionLocX; - public uint RegionLocY; - public string sendkey; - public string recvkey; - public bool online; - - public SimProfileBase() - { - } - } -} diff --git a/Common/OpenSim.Servers/OpenSim.Servers.csproj b/Common/OpenSim.Servers/OpenSim.Servers.csproj index 0c61f75..f0a6eee 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.csproj +++ b/Common/OpenSim.Servers/OpenSim.Servers.csproj @@ -92,6 +92,12 @@ + + Code + + + Code + Code diff --git a/Common/OpenSim.Servers/OpenSim.Servers.dll.build b/Common/OpenSim.Servers/OpenSim.Servers.dll.build index ec868f1..059829f 100644 --- a/Common/OpenSim.Servers/OpenSim.Servers.dll.build +++ b/Common/OpenSim.Servers/OpenSim.Servers.dll.build @@ -11,6 +11,8 @@ + + diff --git a/Common/XmlRpcCS/XMLRPC.csproj b/Common/XmlRpcCS/XMLRPC.csproj index 61f8be0..86f6aaa 100644 --- a/Common/XmlRpcCS/XMLRPC.csproj +++ b/Common/XmlRpcCS/XMLRPC.csproj @@ -70,58 +70,58 @@ - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code - + Code diff --git a/Common/XmlRpcCS/XMLRPC.dll.build b/Common/XmlRpcCS/XMLRPC.dll.build index 2eabfcd..8d5efd1 100644 --- a/Common/XmlRpcCS/XMLRPC.dll.build +++ b/Common/XmlRpcCS/XMLRPC.dll.build @@ -11,24 +11,24 @@ - - - - - - - + + - - + + - - + + + + + + + -- cgit v1.1