From 583f2a9de8e503773a427facd5f81a82b40bd585 Mon Sep 17 00:00:00 2001
From: mingchen
Date: Thu, 5 Jul 2007 15:15:28 +0000
Subject: *Removed SimProfile.cs as it is no longer needed (in favor of
SimProfileData) *Added simulator_data_request XMLRPC method to request data
from the grid server about a sim instead of faking its login *Login is
progressing, now just getting an XML error (http://pastebin.com/942515) -- if
you can fix this, throw MingChen in IRC a Private Message
---
OpenSim/Framework/General/OpenSim.Framework.csproj | 61 +++++------
.../Framework/General/OpenSim.Framework.dll.build | 39 ++++---
OpenSim/Framework/General/SimProfile.cs | 119 ---------------------
3 files changed, 48 insertions(+), 171 deletions(-)
delete mode 100644 OpenSim/Framework/General/SimProfile.cs
(limited to 'OpenSim/Framework/General')
diff --git a/OpenSim/Framework/General/OpenSim.Framework.csproj b/OpenSim/Framework/General/OpenSim.Framework.csproj
index a577ea3..4a72db0 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.csproj
+++ b/OpenSim/Framework/General/OpenSim.Framework.csproj
@@ -97,103 +97,100 @@
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
- Code
-
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
-
+
Code
diff --git a/OpenSim/Framework/General/OpenSim.Framework.dll.build b/OpenSim/Framework/General/OpenSim.Framework.dll.build
index 10fafbf..9fb35bc 100644
--- a/OpenSim/Framework/General/OpenSim.Framework.dll.build
+++ b/OpenSim/Framework/General/OpenSim.Framework.dll.build
@@ -14,39 +14,38 @@
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
-
-
-
+
+
+
+
+
+
+
+
diff --git a/OpenSim/Framework/General/SimProfile.cs b/OpenSim/Framework/General/SimProfile.cs
deleted file mode 100644
index 47f1af3..0000000
--- a/OpenSim/Framework/General/SimProfile.cs
+++ /dev/null
@@ -1,119 +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;
-using libsecondlife;
-using Nwc.XmlRpc;
-
-namespace OpenSim.Framework.Sims
-{
- 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
- {
- Hashtable GridReqParams = new Hashtable();
- GridReqParams["region_handle"] = region_handle.ToString();
- GridReqParams["authkey"] = SendKey;
- ArrayList SendParams = new ArrayList();
- SendParams.Add(GridReqParams);
- XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-
- XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
-
- Hashtable RespData = (Hashtable)GridResp.Value;
- this.UUID = new LLUUID((string)RespData["UUID"]);
- this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
- this.regionname = (string)RespData["regionname"];
- this.sim_ip = (string)RespData["sim_ip"];
- this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
- this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
- this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
- this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
- this.sendkey = SendKey;
- this.recvkey = RecvKey;
- }
- catch (Exception e)
- {
- System.Console.WriteLine(e.ToString());
- }
- return this;
- }
-
- public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
- {
- try
- {
- Hashtable GridReqParams = new Hashtable();
- GridReqParams["UUID"] = UUID.ToString();
- GridReqParams["authkey"] = SendKey;
- ArrayList SendParams = new ArrayList();
- SendParams.Add(GridReqParams);
- XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
-
- XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
-
- Hashtable RespData = (Hashtable)GridResp.Value;
- this.UUID = new LLUUID((string)RespData["UUID"]);
- this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
- this.regionname = (string)RespData["regionname"];
- this.sim_ip = (string)RespData["sim_ip"];
- this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
- this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
- this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
- this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
- this.sendkey = SendKey;
- this.recvkey = RecvKey;
- }
- catch (Exception e)
- {
- System.Console.WriteLine(e.ToString());
- }
- return this;
- }
-
-
- public SimProfile()
- {
- }
- }
-
-}
--
cgit v1.1