diff --git a/OpenGridServices.GridServer/SimProfiles.cs b/OpenGridServices.GridServer/SimProfiles.cs
index bd91d5b259..ae40133ec4 100644
--- a/OpenGridServices.GridServer/SimProfiles.cs
+++ b/OpenGridServices.GridServer/SimProfiles.cs
@@ -41,88 +41,105 @@ using System.Xml;
namespace OpenGridServices.GridServer
{
- ///
- ///
- public class SimProfileManager {
-
- public Dictionary SimProfiles = new Dictionary();
- private OpenGrid_Main m_gridManager;
+ ///
+ ///
+ public class SimProfileManager
+ {
- public SimProfileManager(OpenGrid_Main gridManager) {
- m_gridManager = gridManager;
- }
-
- public void LoadProfiles() { // should abstract this out
- IObjectContainer db;
- db = Db4oFactory.OpenFile("simprofiles.yap");
- IObjectSet result = db.Get(typeof(SimProfileBase));
- foreach (SimProfileBase simprof in result) {
- SimProfiles.Add(simprof.UUID, simprof);
- }
- MainConsole.Instance.WriteLine("SimProfiles.Cs:LoadProfiles() - Successfully loaded " + result.Count.ToString() + " from database");
- db.Close();
- }
+ public Dictionary SimProfiles = new Dictionary();
+ private OpenGrid_Main m_gridManager;
- public SimProfileBase GetProfileByHandle(ulong reqhandle) {
- foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) {
- if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID];
- }
- return null;
- }
+ public SimProfileManager(OpenGrid_Main gridManager)
+ {
+ m_gridManager = gridManager;
+ }
- public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) {
- foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) {
- if(SimProfiles[UUID].UUID==ProfileLLUUID) return SimProfiles[UUID];
- }
- return null;
- }
-
- public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) {
- SimProfileBase TheSim=GetProfileByHandle(regionhandle);
- if(TheSim != null)
- if(TheSim.recvkey==simrecvkey) {
- return true;
- } else {
- return false;
- } else return false;
-
- }
+ public void LoadProfiles()
+ { // should abstract this out
+ IObjectContainer db;
+ db = Db4oFactory.OpenFile("simprofiles.yap");
+ IObjectSet result = db.Get(typeof(SimProfileBase));
+ foreach (SimProfileBase simprof in result)
+ {
+ SimProfiles.Add(simprof.UUID, simprof);
+ }
+ MainConsole.Instance.WriteLine("SimProfiles.Cs:LoadProfiles() - Successfully loaded " + result.Count.ToString() + " from database");
+ db.Close();
+ }
- public string GetXMLNeighbours(ulong reqhandle) {
- string response="";
- SimProfileBase central_region = GetProfileByHandle(reqhandle);
- SimProfileBase neighbour;
- for(int x=-1; x<2; x++) for(int y=-1; y<2; y++) {
- if(GetProfileByHandle(Util.UIntsToLong((uint)((central_region.RegionLocX+x)*256), (uint)(central_region.RegionLocY+y)*256))!=null) {
- neighbour=GetProfileByHandle(Util.UIntsToLong((uint)((central_region.RegionLocX+x)*256), (uint)(central_region.RegionLocY+y)*256));
- response+="";
- response+="" + neighbour.sim_ip + "";
- response+="" + neighbour.sim_port.ToString() + "";
- response+="" + neighbour.RegionLocX.ToString() + "";
- response+="" + neighbour.RegionLocY.ToString() + "";
- response+="" + neighbour.regionhandle.ToString() + "";
- response+="";
+ public SimProfileBase GetProfileByHandle(ulong reqhandle)
+ {
+ foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys)
+ {
+ if (SimProfiles[UUID].regionhandle == reqhandle) return SimProfiles[UUID];
+ }
+ return null;
+ }
- }
- }
- return response;
- }
+ public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID)
+ {
+ foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys)
+ {
+ if (SimProfiles[UUID].UUID == ProfileLLUUID) return SimProfiles[UUID];
+ }
+ return null;
+ }
- public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {
- SimProfileBase newprofile = new SimProfileBase();
- newprofile.regionname=regionname;
- newprofile.sim_ip=sim_ip;
- newprofile.sim_port=sim_port;
- newprofile.RegionLocX=RegionLocX;
- newprofile.RegionLocY=RegionLocY;
- newprofile.caps_url="http://" + sim_ip + ":9000/";
- newprofile.sendkey=sendkey;
- newprofile.recvkey=recvkey;
- newprofile.regionhandle=Util.UIntsToLong((RegionLocX*256), (RegionLocY*256));
- newprofile.UUID=LLUUID.Random();
- this.SimProfiles.Add(newprofile.UUID,newprofile);
- return newprofile;
- }
+ public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey)
+ {
+ SimProfileBase TheSim = GetProfileByHandle(regionhandle);
+ if (TheSim != null)
+ if (TheSim.recvkey == simrecvkey)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ else return false;
+
+ }
+
+ public string GetXMLNeighbours(ulong reqhandle)
+ {
+ string response = "";
+ SimProfileBase central_region = GetProfileByHandle(reqhandle);
+ SimProfileBase neighbour;
+ for (int x = -1; x < 2; x++) for (int y = -1; y < 2; y++)
+ {
+ if (GetProfileByHandle(Util.UIntsToLong((uint)((central_region.RegionLocX + x) * 256), (uint)(central_region.RegionLocY + y) * 256)) != null)
+ {
+ neighbour = GetProfileByHandle(Util.UIntsToLong((uint)((central_region.RegionLocX + x) * 256), (uint)(central_region.RegionLocY + y) * 256));
+ response += "";
+ response += "" + neighbour.sim_ip + "";
+ response += "" + neighbour.sim_port.ToString() + "";
+ response += "" + neighbour.RegionLocX.ToString() + "";
+ response += "" + neighbour.RegionLocY.ToString() + "";
+ response += "" + neighbour.regionhandle.ToString() + "";
+ response += "";
+
+ }
+ }
+ return response;
+ }
+
+ public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey)
+ {
+ SimProfileBase newprofile = new SimProfileBase();
+ newprofile.regionname = regionname;
+ newprofile.sim_ip = sim_ip;
+ newprofile.sim_port = sim_port;
+ newprofile.RegionLocX = RegionLocX;
+ newprofile.RegionLocY = RegionLocY;
+ newprofile.caps_url = "http://" + sim_ip + ":9000/";
+ newprofile.sendkey = sendkey;
+ newprofile.recvkey = recvkey;
+ newprofile.regionhandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
+ newprofile.UUID = LLUUID.Random();
+ this.SimProfiles.Add(newprofile.UUID, newprofile);
+ return newprofile;
+ }
public XmlRpcResponse XmlRpcLoginToSimulatorMethod(XmlRpcRequest request)
{
@@ -158,15 +175,15 @@ namespace OpenGridServices.GridServer
if (GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX + x) * 256), (uint)(TheSim.RegionLocY + y) * 256)) != null)
{
neighbour = GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX + x) * 256), (uint)(TheSim.RegionLocY + y) * 256));
-
+
NeighbourBlock = new Hashtable();
NeighbourBlock["sim_ip"] = neighbour.sim_ip;
NeighbourBlock["sim_port"] = neighbour.sim_port.ToString();
NeighbourBlock["region_locx"] = neighbour.RegionLocX.ToString();
NeighbourBlock["region_locy"] = neighbour.RegionLocY.ToString();
NeighbourBlock["UUID"] = neighbour.UUID.ToString();
-
- if(neighbour.UUID!=TheSim.UUID) SimNeighboursData.Add(NeighbourBlock);
+
+ if (neighbour.UUID != TheSim.UUID) SimNeighboursData.Add(NeighbourBlock);
}
}
@@ -176,9 +193,9 @@ namespace OpenGridServices.GridServer
responseData["regionname"] = TheSim.regionname;
responseData["estate_id"] = "1";
responseData["neighbours"] = SimNeighboursData;
-
- responseData["sim_ip"] = TheSim.sim_ip;
- responseData["sim_port"] = TheSim.sim_port.ToString();
+
+ responseData["sim_ip"] = TheSim.sim_ip;
+ responseData["sim_port"] = TheSim.sim_port.ToString();
responseData["asset_url"] = m_gridManager.Cfg.DefaultAssetServer;
responseData["asset_sendkey"] = m_gridManager.Cfg.AssetSendKey;
responseData["asset_recvkey"] = m_gridManager.Cfg.AssetRecvKey;
@@ -193,97 +210,103 @@ namespace OpenGridServices.GridServer
public string RestSetSimMethod(string request, string path, string param)
{
- Console.WriteLine("SimProfiles.cs:RestSetSimMethod() - processing request......");
+ Console.WriteLine("SimProfiles.cs:RestSetSimMethod() - processing request......");
SimProfileBase TheSim;
TheSim = GetProfileByLLUUID(new LLUUID(param));
- if ((TheSim) == null) {
- TheSim = new SimProfileBase();
- LLUUID UUID = new LLUUID(param);
- TheSim.UUID=UUID;
- }
-
+ if ((TheSim) == null)
+ {
+ TheSim = new SimProfileBase();
+ LLUUID UUID = new LLUUID(param);
+ TheSim.UUID = UUID;
+ }
+
XmlDocument doc = new XmlDocument();
doc.LoadXml(request);
- XmlNode rootnode=doc.FirstChild;
+ XmlNode rootnode = doc.FirstChild;
XmlNode authkeynode = rootnode.ChildNodes[0];
if (authkeynode.Name != "authkey")
- {
- return "ERROR! bad XML - expected authkey tag";
- }
+ {
+ return "ERROR! bad XML - expected authkey tag";
+ }
XmlNode simnode = rootnode.ChildNodes[1];
if (simnode.Name != "sim")
- {
- return "ERROR! bad XML - expected sim tag";
- }
-
+ {
+ return "ERROR! bad XML - expected sim tag";
+ }
+
if (authkeynode.InnerText != m_gridManager.Cfg.SimRecvKey)
+ {
+ return "ERROR! invalid key";
+ }
+ for (int i = 0; i < simnode.ChildNodes.Count; i++)
+ {
+ switch (simnode.ChildNodes[i].Name)
{
- return "ERROR! invalid key";
- }
- for (int i = 0; i < simnode.ChildNodes.Count; i++) {
- switch (simnode.ChildNodes[i].Name) {
- case "regionname":
- TheSim.regionname = simnode.ChildNodes[i].InnerText;
- break;
+ case "regionname":
+ TheSim.regionname = simnode.ChildNodes[i].InnerText;
+ break;
- case "sim_ip":
- TheSim.sim_ip = simnode.ChildNodes[i].InnerText;
- break;
+ case "sim_ip":
+ TheSim.sim_ip = simnode.ChildNodes[i].InnerText;
+ break;
- case "sim_port":
- TheSim.sim_port = Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
- break;
+ case "sim_port":
+ TheSim.sim_port = Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
+ break;
- case "region_locx":
- TheSim.RegionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
- TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
- break;
+ case "region_locx":
+ TheSim.RegionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
+ TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
+ break;
- case "region_locy":
+ case "region_locy":
TheSim.RegionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
- break;
- }
- }
-
- try {
- SimProfiles.Add(TheSim.UUID, TheSim);
- IObjectContainer db;
- db = Db4oFactory.OpenFile("simprofiles.yap");
- db.Set(TheSim);
- db.Close();
- return "OK";
- } catch(Exception e) {
- return "ERROR! could not save to database!";
- }
+ break;
+ }
+ }
+
+ try
+ {
+ SimProfiles.Add(TheSim.UUID, TheSim);
+ IObjectContainer db;
+ db = Db4oFactory.OpenFile("simprofiles.yap");
+ db.Set(TheSim);
+ db.Close();
+ return "OK";
+ }
+ catch (Exception e)
+ {
+ return "ERROR! could not save to database!";
+ }
}
-
- public string RestGetRegionMethod(string request, string path, string param )
- {
- SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param));
- return RestGetSimMethod("", "/sims/", param);
- }
- public string RestSetRegionMethod(string request, string path, string param )
- {
- SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param));
- return RestSetSimMethod("", "/sims/", param);
- }
-
- public string RestGetSimMethod(string request, string path, string param )
+ public string RestGetRegionMethod(string request, string path, string param)
+ {
+ SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param));
+ return RestGetSimMethod("", "/sims/", param);
+ }
+
+ public string RestSetRegionMethod(string request, string path, string param)
+ {
+ SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param));
+ return RestSetSimMethod("", "/sims/", param);
+ }
+
+ public string RestGetSimMethod(string request, string path, string param)
{
string respstring = String.Empty;
SimProfileBase TheSim;
LLUUID UUID = new LLUUID(param);
TheSim = GetProfileByLLUUID(UUID);
-
+
if (!(TheSim == null))
{
- respstring = "";
- respstring += "" + m_gridManager.Cfg.SimSendKey + "";
+ respstring = "";
+ respstring += "" + m_gridManager.Cfg.SimSendKey + "";
respstring += "";
respstring += "" + TheSim.UUID.ToString() + "";
respstring += "" + TheSim.regionname + "";
@@ -293,13 +316,13 @@ namespace OpenGridServices.GridServer
respstring += "" + TheSim.RegionLocY.ToString() + "";
respstring += "1";
respstring += "";
- respstring += "";
+ respstring += "";
}
-
+
return respstring;
}
- }
+ }
}
diff --git a/OpenSim.Framework/AgentInventory.cs b/OpenSim.Framework/AgentInventory.cs
index f715129490..cabefc908e 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/OpenSim.Framework/AgentInventory.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
using libsecondlife.Packets;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
namespace OpenSim.Framework.Inventory
{
diff --git a/OpenSim.Framework/IAssetServer.cs b/OpenSim.Framework/Interfaces/IAssetServer.cs
similarity index 96%
rename from OpenSim.Framework/IAssetServer.cs
rename to OpenSim.Framework/Interfaces/IAssetServer.cs
index a0de548a0e..3f86accfb4 100644
--- a/OpenSim.Framework/IAssetServer.cs
+++ b/OpenSim.Framework/Interfaces/IAssetServer.cs
@@ -30,7 +30,7 @@ using System.Net.Sockets;
using System.IO;
using System.Threading;
using libsecondlife;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{
diff --git a/OpenSim.Framework/IConfig.cs b/OpenSim.Framework/Interfaces/IConfig.cs
similarity index 100%
rename from OpenSim.Framework/IConfig.cs
rename to OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/OpenSim.Framework/IGenericConfig.cs b/OpenSim.Framework/Interfaces/IGenericConfig.cs
similarity index 100%
rename from OpenSim.Framework/IGenericConfig.cs
rename to OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/OpenSim.Framework/IGridConfig.cs b/OpenSim.Framework/Interfaces/IGridConfig.cs
similarity index 100%
rename from OpenSim.Framework/IGridConfig.cs
rename to OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/OpenSim.Framework/IGridServer.cs b/OpenSim.Framework/Interfaces/IGridServer.cs
similarity index 96%
rename from OpenSim.Framework/IGridServer.cs
rename to OpenSim.Framework/Interfaces/IGridServer.cs
index 9c06a6bf11..b01f30834f 100644
--- a/OpenSim.Framework/IGridServer.cs
+++ b/OpenSim.Framework/Interfaces/IGridServer.cs
@@ -27,13 +27,14 @@
using System;
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.IO;
using libsecondlife;
using OpenSim;
+using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{
@@ -51,7 +52,7 @@ namespace OpenSim.Framework.Interfaces
string GetName();
bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
- void Close();
+ void Close();
}
public struct UUIDBlock
diff --git a/OpenSim.Framework/ILocalStorage.cs b/OpenSim.Framework/Interfaces/ILocalStorage.cs
similarity index 96%
rename from OpenSim.Framework/ILocalStorage.cs
rename to OpenSim.Framework/Interfaces/ILocalStorage.cs
index 2c45baaaf9..a4d2ba1b1d 100644
--- a/OpenSim.Framework/ILocalStorage.cs
+++ b/OpenSim.Framework/Interfaces/ILocalStorage.cs
@@ -27,7 +27,7 @@
using System;
using libsecondlife;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{
diff --git a/OpenSim.Framework/IScriptAPI.cs b/OpenSim.Framework/Interfaces/IScriptAPI.cs
similarity index 87%
rename from OpenSim.Framework/IScriptAPI.cs
rename to OpenSim.Framework/Interfaces/IScriptAPI.cs
index 2f58198551..3ad0f063e7 100644
--- a/OpenSim.Framework/IScriptAPI.cs
+++ b/OpenSim.Framework/Interfaces/IScriptAPI.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
+using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{
diff --git a/OpenSim.Framework/IScriptEngine.cs b/OpenSim.Framework/Interfaces/IScriptEngine.cs
similarity index 100%
rename from OpenSim.Framework/IScriptEngine.cs
rename to OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/OpenSim.Framework/IUserConfig.cs b/OpenSim.Framework/Interfaces/IUserConfig.cs
similarity index 100%
rename from OpenSim.Framework/IUserConfig.cs
rename to OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/OpenSim.Framework/IUserServer.cs b/OpenSim.Framework/Interfaces/IUserServer.cs
similarity index 100%
rename from OpenSim.Framework/IUserServer.cs
rename to OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/OpenSim.Framework/LocalGridBase.cs b/OpenSim.Framework/Interfaces/LocalGridBase.cs
similarity index 94%
rename from OpenSim.Framework/LocalGridBase.cs
rename to OpenSim.Framework/Interfaces/LocalGridBase.cs
index 6857d6ddc9..c3ab262459 100644
--- a/OpenSim.Framework/LocalGridBase.cs
+++ b/OpenSim.Framework/Interfaces/LocalGridBase.cs
@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
+using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{
diff --git a/OpenSim.Framework/RemoteGridBase.cs b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
similarity index 94%
rename from OpenSim.Framework/RemoteGridBase.cs
rename to OpenSim.Framework/Interfaces/RemoteGridBase.cs
index 0b72b9f388..f24ec66d0e 100644
--- a/OpenSim.Framework/RemoteGridBase.cs
+++ b/OpenSim.Framework/Interfaces/RemoteGridBase.cs
@@ -1,8 +1,9 @@
using System;
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
+using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces
{
@@ -22,14 +23,14 @@ namespace OpenSim.Framework.Interfaces
public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
public abstract void Close();
- public abstract Hashtable GridData {
- get;
- set;
- }
-
- public abstract ArrayList neighbours {
- get;
- set;
- }
+ public abstract Hashtable GridData {
+ get;
+ set;
+ }
+
+ public abstract ArrayList neighbours {
+ get;
+ set;
+ }
}
}
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/OpenSim.Framework/OpenSim.Framework.csproj
index 68b7ef0e28..ea4817e802 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/OpenSim.Framework/OpenSim.Framework.csproj
@@ -78,72 +78,18 @@
-
- Code
-
Code
-
- Code
-
Code
Code
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
Code
-
- Code
-
-
- Code
-
-
- Code
-
-
- Code
-
Code
@@ -162,9 +108,63 @@
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/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index fb7fbd4d9e..8048de5329 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -11,35 +11,35 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs
index ad3e0287f4..8acb20be76 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim.Framework/SimProfile.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Sims
}
return this;
}
-
+
public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
{
try
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Sims
}
return this;
}
-
+
public SimProfile()
{
diff --git a/OpenSim.Framework/AgentCiruitData.cs b/OpenSim.Framework/Types/AgentCiruitData.cs
similarity index 88%
rename from OpenSim.Framework/AgentCiruitData.cs
rename to OpenSim.Framework/Types/AgentCiruitData.cs
index e1a79b9a0a..555b3b96a8 100644
--- a/OpenSim.Framework/AgentCiruitData.cs
+++ b/OpenSim.Framework/Types/AgentCiruitData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework.Types
{
public class AgentCircuitData
{
@@ -11,7 +11,7 @@ namespace OpenSim.Framework.Interfaces
public LLUUID AgentID;
public LLUUID SessionID;
public LLUUID SecureSessionID;
- public LLVector3 startpos;
+ public LLVector3 startpos;
public string firstname;
public string lastname;
public uint circuitcode;
diff --git a/OpenSim.Framework/AssetBase.cs b/OpenSim.Framework/Types/AssetBase.cs
similarity index 86%
rename from OpenSim.Framework/AssetBase.cs
rename to OpenSim.Framework/Types/AssetBase.cs
index 8206b307e0..f6104f8e14 100644
--- a/OpenSim.Framework/AssetBase.cs
+++ b/OpenSim.Framework/Types/AssetBase.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-namespace OpenSim.Framework.Assets
+namespace OpenSim.Framework.Types
{
public class AssetBase
{
diff --git a/OpenSim.Framework/Login.cs b/OpenSim.Framework/Types/Login.cs
similarity index 87%
rename from OpenSim.Framework/Login.cs
rename to OpenSim.Framework/Types/Login.cs
index 8a67853c44..ed77a464c2 100644
--- a/OpenSim.Framework/Login.cs
+++ b/OpenSim.Framework/Types/Login.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework.Types
{
public class Login
{
diff --git a/OpenSim.Framework/NeighbourInfo.cs b/OpenSim.Framework/Types/NeighbourInfo.cs
similarity index 84%
rename from OpenSim.Framework/NeighbourInfo.cs
rename to OpenSim.Framework/Types/NeighbourInfo.cs
index 8b4fa64e1f..58b6cb164d 100644
--- a/OpenSim.Framework/NeighbourInfo.cs
+++ b/OpenSim.Framework/Types/NeighbourInfo.cs
@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenSim.Framework.Interfaces
+namespace OpenSim.Framework.Types
{
public class NeighbourInfo
{
diff --git a/OpenSim.Framework/OSVector3.cs b/OpenSim.Framework/Types/OSVector3.cs
similarity index 81%
rename from OpenSim.Framework/OSVector3.cs
rename to OpenSim.Framework/Types/OSVector3.cs
index b5d12233c1..8fb840b9fc 100644
--- a/OpenSim.Framework/OSVector3.cs
+++ b/OpenSim.Framework/Types/OSVector3.cs
@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
-namespace OpenSim.Framework
+namespace OpenSim.Framework.Types
{
public class OSVector3
{
diff --git a/OpenSim.Framework/PrimData.cs b/OpenSim.Framework/Types/PrimData.cs
similarity index 97%
rename from OpenSim.Framework/PrimData.cs
rename to OpenSim.Framework/Types/PrimData.cs
index ee4188d39c..9b41a1214b 100644
--- a/OpenSim.Framework/PrimData.cs
+++ b/OpenSim.Framework/Types/PrimData.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
-namespace OpenSim.Framework.Assets
+namespace OpenSim.Framework.Types
{
public class PrimData
{
diff --git a/OpenSim.Framework/UserProfile.cs b/OpenSim.Framework/UserProfile.cs
index 04e9fd54c7..5b7405a6de 100644
--- a/OpenSim.Framework/UserProfile.cs
+++ b/OpenSim.Framework/UserProfile.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework.User
Circuits = new Dictionary();
Inventory = new AgentInventory();
homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
- homepos = new LLVector3();
+ homepos = new LLVector3();
homelookat = new LLVector3();
}
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index 33f2abd4b2..eb8b7cde72 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.User
LLUUID AgentID = TheUser.UUID;
TheUser.InitSessionData();
-
+
//for loading data from a grid server, make any changes in CustomiseResponse() (or create a sub class of this and override that method)
//SimProfile SimInfo = new SimProfile();
//SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
@@ -140,7 +140,7 @@ namespace OpenSim.Framework.User
ArrayList AgentInventory = new ArrayList();
Console.WriteLine("adding inventory to response");
- Hashtable TempHash;
+ Hashtable TempHash;
foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)
{
TempHash = new Hashtable();
@@ -200,7 +200,7 @@ namespace OpenSim.Framework.User
this.CustomiseResponse(ref responseData, TheUser);
response.Value = responseData;
- // TheUser.SendDataToSim(SimInfo);
+ // TheUser.SendDataToSim(SimInfo);
return response;
}
@@ -211,7 +211,7 @@ namespace OpenSim.Framework.User
//}
}
return response;
-
+
}
private static XmlRpcResponse CreateErrorConnectingToGridResponse()
@@ -258,9 +258,9 @@ namespace OpenSim.Framework.User
SimParams["firstname"] = theUser.firstname;
SimParams["lastname"] = theUser.lastname;
SimParams["agent_id"] = theUser.UUID.ToString();
- SimParams["circuit_code"] = (Int32)circode;
- SimParams["startpos_x"] = theUser.homepos.X.ToString();
- SimParams["startpos_y"] = theUser.homepos.Y.ToString();
+ SimParams["circuit_code"] = (Int32)circode;
+ SimParams["startpos_x"] = theUser.homepos.X.ToString();
+ SimParams["startpos_y"] = theUser.homepos.Y.ToString();
SimParams["startpos_z"] = theUser.homepos.Z.ToString();
ArrayList SendParams = new ArrayList();
SendParams.Add(SimParams);
diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/OpenSim.Framework/UserProfileManagerBase.cs
index c9fbf4cf49..d1307a5958 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/OpenSim.Framework/UserProfileManagerBase.cs
@@ -103,7 +103,8 @@ namespace OpenSim.Framework.User
newprofile.firstname = firstname;
newprofile.lastname = lastname;
newprofile.MD5passwd = MD5passwd;
- newprofile.UUID = LLUUID.Random();
newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
+ newprofile.UUID = LLUUID.Random();
+ newprofile.Inventory.CreateRootFolder(newprofile.UUID, true);
this.UserProfiles.Add(newprofile.UUID, newprofile);
return newprofile;
}
diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index fc0ba4a04a..9162bd3408 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -4,7 +4,7 @@ using System.Text;
using System.Threading;
using System.IO;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
using libsecondlife;
using Db4objects.Db4o;
diff --git a/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index 311179ba37..f4b8872b3b 100644
--- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim.GridInterfaces/Local/LocalGridServer.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
using System.Threading;
using System.IO;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using libsecondlife;
using Db4objects.Db4o;
using Db4objects.Db4o.Query;
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 71fca57f14..d2f8de11d0 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
@@ -7,7 +7,7 @@ using System.Net.Sockets;
using System.IO;
using libsecondlife;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
namespace OpenSim.GridInterfaces.Remote
diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index 7cd68df3f2..a47547141f 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
@@ -34,7 +34,7 @@ using System.IO;
using libsecondlife;
using Nwc.XmlRpc;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
namespace OpenSim.GridInterfaces.Remote
{
@@ -44,28 +44,28 @@ namespace OpenSim.GridInterfaces.Remote
private string GridSendKey;
private string GridRecvKey;
private Dictionary AgentCircuits = new Dictionary();
- private ArrayList simneighbours = new ArrayList();
- private Hashtable griddatahash;
+ private ArrayList simneighbours = new ArrayList();
+ private Hashtable griddatahash;
public override Dictionary agentcircuits
{
get { return AgentCircuits; }
set { AgentCircuits = value; }
}
-
+
public override ArrayList neighbours
{
get { return simneighbours; }
set { simneighbours = value; }
- }
+ }
public override Hashtable GridData
{
get { return griddatahash; }
set { griddatahash = value; }
- }
-
-
+ }
+
+
public RemoteGridServer()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created");
@@ -84,15 +84,15 @@ namespace OpenSim.GridInterfaces.Remote
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);
Hashtable GridRespData = (Hashtable)GridResp.Value;
- this.griddatahash=GridRespData;
+ this.griddatahash=GridRespData;
if(GridRespData.ContainsKey("error")) {
string errorstring = (string)GridRespData["error"];
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring);
return false;
- }
- this.neighbours = (ArrayList)GridRespData["neighbours"];
+ }
+ this.neighbours = (ArrayList)GridRespData["neighbours"];
Console.WriteLine(simneighbours.Count);
return true;
}
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index 998a9db7d9..258bda07fc 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -2,7 +2,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Assets;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
using libsecondlife;
using libsecondlife.Packets;
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
index 573e5fdbc0..e217d78bea 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -32,7 +32,7 @@ using libsecondlife;
using libsecondlife.Packets;
using OpenSim;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities;
namespace OpenSim.Assets
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
index a50bb2b1f9..136ae534bd 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim.RegionServer/Assets/InventoryCache.cs
@@ -32,7 +32,7 @@ using OpenSim;
using libsecondlife.Packets;
//using OpenSim.GridServers;
using OpenSim.Framework.Inventory;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
namespace OpenSim.Assets
@@ -125,7 +125,7 @@ namespace OpenSim.Assets
return res;
}
- public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Assets.AssetBase asset)
+ public LLUUID AddNewInventoryItem(SimClient remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
{
LLUUID newItem = null;
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
@@ -161,7 +161,7 @@ namespace OpenSim.Assets
return res;
}
- public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Assets.AssetBase asset)
+ public bool UpdateInventoryItemAsset(SimClient remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
{
if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{
diff --git a/OpenSim.RegionServer/ConsoleCmds.cs b/OpenSim.RegionServer/ConsoleCmds.cs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 2dcee6af8d..ae391a9a38 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -121,9 +121,6 @@
Code
-
- Code
-
Code
@@ -145,9 +142,6 @@
Code
-
- Code
-
Code
@@ -187,12 +181,6 @@
Code
-
- Code
-
-
- Code
-
Code
@@ -202,9 +190,6 @@
Code
-
- Code
-
Code
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index ac93c194c1..abd7776166 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -12,7 +12,6 @@
-
@@ -20,7 +19,6 @@
-
@@ -34,12 +32,9 @@
-
-
-
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 151ac51340..e3e9b98f92 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -41,6 +41,7 @@ using libsecondlife.Packets;
using OpenSim.world;
using OpenSim.Terrain;
using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
using OpenSim.UserServer;
using OpenSim.Assets;
using OpenSim.CAPS;
@@ -82,7 +83,7 @@ namespace OpenSim
public string m_physicsEngine;
public bool m_sandbox = false;
public bool m_loginserver;
- public OpenGridProtocolServer OGSServer;
+ public OpenGridProtocolServer OGSServer;
public bool user_accounts = false;
public bool gridLocalAsset = false;
@@ -205,8 +206,8 @@ namespace OpenSim
if (gridServer.GetName() == "Remote")
{
- // should startup the OGS protocol server here
- OGSServer = new OpenGridProtocolServer(8500);
+ // should startup the OGS protocol server here
+ //OGSServer = new OpenGridProtocolServer(8500);
// we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
httpServer.AddXmlRPCHandler("expect_user",
@@ -298,12 +299,13 @@ namespace OpenSim
m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
httpServer.Start();
-
- if(gridServer.GetName() == "Remote") {
- m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
- OGSServer.Start();
- }
-
+
+ if (gridServer.GetName() == "Remote")
+ {
+ m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
+ OGSServer.Start();
+ }
+
MainServerListener();
m_heartbeatTimer.Enabled = true;
@@ -523,7 +525,7 @@ namespace OpenSim
case "terrain":
string result = "";
- if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams,ref result))
+ if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
{
m_console.WriteLine(result);
}
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs
index 4b4132e265..9a0a6eb506 100644
--- a/OpenSim.RegionServer/SimClient.cs
+++ b/OpenSim.RegionServer/SimClient.cs
@@ -36,7 +36,7 @@ using System.IO;
using System.Threading;
using System.Timers;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
using OpenSim.world;
diff --git a/OpenSim.RegionServer/SimConsole.cs b/OpenSim.RegionServer/SimConsole.cs
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
index 6fb5d727b6..61242481ba 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim.RegionServer/world/Primitive.cs
@@ -6,7 +6,7 @@ using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Physics.Manager;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
namespace OpenSim.world
{
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 616dc25857..34e32f8847 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -6,7 +6,7 @@ using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Framework.Interfaces;
using OpenSim.Physics.Manager;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory;
namespace OpenSim.world
diff --git a/OpenSim.RegionServer/world/ScriptEngine.cs b/OpenSim.RegionServer/world/ScriptEngine.cs
deleted file mode 100644
index f20a08ec1b..0000000000
--- a/OpenSim.RegionServer/world/ScriptEngine.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.world
-{
- public class ScriptEngine
- {
- public ScriptEngine(World env)
- {
- }
-
- public void LoadScript()
- {
-
- }
- }
-}
diff --git a/OpenSim.RegionServer/world/SurfacePatch.cs b/OpenSim.RegionServer/world/SurfacePatch.cs
deleted file mode 100644
index 71e4116d11..0000000000
--- a/OpenSim.RegionServer/world/SurfacePatch.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.world
-{
- public class SurfacePatch
- {
- public float[] HeightMap;
-
- public SurfacePatch() {
- HeightMap = new float[16*16];
-
- int xinc;
- int yinc;
- for(xinc=0; xinc<16; xinc++) for(yinc=0; yinc<16; yinc++) {
- HeightMap[xinc+(yinc*16)]=100.0f;
- }
-
- }
- }
-}
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index e0f2e6fa51..69a6494196 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -8,11 +8,11 @@ using System.IO;
using System.Threading;
using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain;
using OpenSim.Framework.Inventory;
using OpenSim.Assets;
-using OpenSim.world.scripting;
+//using OpenSim.world.scripting;
using OpenSim.RegionServer.world.scripting;
using OpenSim.RegionServer.world.scripting.Scripts;
using OpenSim.Terrain;
@@ -25,7 +25,7 @@ namespace OpenSim.world
public Dictionary Entities;
public Dictionary Avatars;
public Dictionary Prims;
- public ScriptEngine Scripts;
+ //public ScriptEngine Scripts;
public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
public uint _localNumber = 0;
private PhysicsScene phyScene;
diff --git a/OpenSim.RegionServer/world/WorldPacketHandlers.cs b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
index 0643a4e8f7..70cbc6b820 100644
--- a/OpenSim.RegionServer/world/WorldPacketHandlers.cs
+++ b/OpenSim.RegionServer/world/WorldPacketHandlers.cs
@@ -5,7 +5,7 @@ using libsecondlife;
using libsecondlife.Packets;
using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain;
using OpenSim.Framework.Inventory;
using OpenSim.Assets;
diff --git a/OpenSim.RegionServer/world/WorldScripting.cs b/OpenSim.RegionServer/world/WorldScripting.cs
index 2f85869711..44ef05a2e9 100644
--- a/OpenSim.RegionServer/world/WorldScripting.cs
+++ b/OpenSim.RegionServer/world/WorldScripting.cs
@@ -5,6 +5,7 @@ using System.IO;
using System.Reflection;
using OpenSim.Framework;
using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
using libsecondlife;
namespace OpenSim.world
diff --git a/OpenSim.RegionServer/world/scripting/IScript.cs b/OpenSim.RegionServer/world/scripting/IScript.cs
deleted file mode 100644
index 550594d343..0000000000
--- a/OpenSim.RegionServer/world/scripting/IScript.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OpenSim.world.scripting
-{
- public interface IScriptHost {
- bool Register(IScript iscript);
- }
- public interface IScript
- {
- string Name{get;set;}
- IScriptHost Host{get;set;}
- void Show();
- }
-}
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
index dc3402e5f2..c66c148f32 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
+++ b/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
@@ -5,6 +5,7 @@ using OpenSim.Scripting.EmbeddedJVM.Types;
using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework;
+using OpenSim.Framework.Types;
namespace OpenSim.Scripting.EmbeddedJVM
{
diff --git a/OpenSim.Servers/LocalUserProfileManager.cs b/OpenSim.Servers/LocalUserProfileManager.cs
index 6166e02b9d..989af22586 100644
--- a/OpenSim.Servers/LocalUserProfileManager.cs
+++ b/OpenSim.Servers/LocalUserProfileManager.cs
@@ -33,6 +33,7 @@ using OpenSim.Framework.User;
using OpenSim.Framework.Grid;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Interfaces;
+using OpenSim.Framework.Types;
using libsecondlife;
namespace OpenSim.UserServer
diff --git a/OpenSim.Servers/LoginServer.cs b/OpenSim.Servers/LoginServer.cs
index 77f0dd8631..c56dbc1971 100644
--- a/OpenSim.Servers/LoginServer.cs
+++ b/OpenSim.Servers/LoginServer.cs
@@ -43,6 +43,7 @@ using OpenSim.Framework.Grid;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.User;
using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Types;
namespace OpenSim.UserServer
{
diff --git a/OpenSim.Servers/OpenGridProtocol.cs b/OpenSim.Servers/OpenGridProtocol.cs
index c3d7d5cef9..55c47b4300 100644
--- a/OpenSim.Servers/OpenGridProtocol.cs
+++ b/OpenSim.Servers/OpenGridProtocol.cs
@@ -1,89 +1,94 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading;
-using Nwc.XmlRpc;
-using System.Collections;
-
-namespace OpenSim.Servers
-{
- public class OpenGridProtocolServer
- {
-
- private Thread m_workerThread;
- private Socket m_listenerSocket;
- private IPEndPoint m_IPendpoint;
-
- private int m_port;
- private ArrayList m_clients;
-
- private class ClientHandler {
- private Thread m_clientThread;
- private Socket m_socketHandle;
-
- public ClientHandler(Socket clientSocketHandle) {
- m_socketHandle=clientSocketHandle;
- m_clientThread = new Thread(new ThreadStart(DoWork));
- m_clientThread.IsBackground = true;
- m_clientThread.Start();
- }
-
- private void DoWork() {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client");
- this.WriteLine("OpenSim 0.1, running OGS protocol 1.0");
-
- }
-
- private void WriteLine(string theline) {
- theline+="\n";
- byte[] thelinebuffer = System.Text.Encoding.ASCII.GetBytes(theline.ToCharArray());
- m_socketHandle.Send(thelinebuffer,theline.Length,0);
- }
- }
-
- public OpenGridProtocolServer(int port)
- {
- m_port = port;
- }
-
- public void Start()
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: Start() - Opening server socket");
-
- m_clients = new ArrayList();
- m_workerThread = new Thread(new ThreadStart(StartServerSocket));
- m_workerThread.IsBackground = true;
- m_workerThread.Start();
- }
-
- private void StartServerSocket()
- {
- try
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK");
-
-
- m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port);
- m_listenerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
- m_listenerSocket.Bind(m_IPendpoint);
- m_listenerSocket.Listen(4);
-
- Socket sockethandle;
- while (true)
- {
- sockethandle = m_listenerSocket.Accept();
- lock(m_clients.SyncRoot) {
- m_clients.Add(new OpenGridProtocolServer.ClientHandler(sockethandle));
- }
- }
- }
- catch (Exception e)
- {
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message);
- }
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using Nwc.XmlRpc;
+using System.Collections;
+
+namespace OpenSim.Servers
+{
+ public class OpenGridProtocolServer
+ {
+
+ private Thread m_workerThread;
+ private Socket m_listenerSocket;
+ private IPEndPoint m_IPendpoint;
+
+ private int m_port;
+ private ArrayList m_clients;
+
+ private class ClientHandler
+ {
+ private Thread m_clientThread;
+ private Socket m_socketHandle;
+
+ public ClientHandler(Socket clientSocketHandle)
+ {
+ m_socketHandle = clientSocketHandle;
+ m_clientThread = new Thread(new ThreadStart(DoWork));
+ m_clientThread.IsBackground = true;
+ m_clientThread.Start();
+ }
+
+ private void DoWork()
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client");
+ this.WriteLine("OpenSim 0.1, running OGS protocol 1.0");
+
+ }
+
+ private void WriteLine(string theline)
+ {
+ theline += "\n";
+ byte[] thelinebuffer = System.Text.Encoding.ASCII.GetBytes(theline.ToCharArray());
+ m_socketHandle.Send(thelinebuffer, theline.Length, 0);
+ }
+ }
+
+ public OpenGridProtocolServer(int port)
+ {
+ m_port = port;
+ }
+
+ public void Start()
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: Start() - Opening server socket");
+
+ m_clients = new ArrayList();
+ m_workerThread = new Thread(new ThreadStart(StartServerSocket));
+ m_workerThread.IsBackground = true;
+ m_workerThread.Start();
+ }
+
+ private void StartServerSocket()
+ {
+ try
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK");
+
+
+ m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port);
+ m_listenerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+ m_listenerSocket.Bind(m_IPendpoint);
+ m_listenerSocket.Listen(4);
+
+ Socket sockethandle;
+ while (true)
+ {
+ sockethandle = m_listenerSocket.Accept();
+ lock (m_clients.SyncRoot)
+ {
+ m_clients.Add(new OpenGridProtocolServer.ClientHandler(sockethandle));
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message);
+ }
+ }
+ }
+}
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index 7b6f765277..2bcd91c0ca 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
@@ -33,7 +33,7 @@ using System.Collections.Generic;
using System.Data;
using libsecondlife;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain;
using BerkeleyDb;
using Kds.Serialization;
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index da777019c5..488da58c32 100644
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -30,7 +30,7 @@ using Db4objects.Db4o;
using Db4objects.Db4o.Query;
using libsecondlife;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain;
namespace OpenSim.Storage.LocalStorageDb4o
diff --git a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
index 16b6685c3b..ba9e13914e 100644
--- a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
@@ -5,7 +5,7 @@ using Db4objects.Db4o;
using Db4objects.Db4o.Query;
using libsecondlife;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
namespace OpenSim.Storage.LocalStorageDb4o
{
diff --git a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 8c9a5e1c0c..ff7b146cdb 100644
--- a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -34,7 +34,7 @@ using System.Data;
using System.Data.SQLite;
using libsecondlife;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Assets;
+using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain;
namespace OpenSim.Storage.LocalStorageSQLite
diff --git a/OpenSim.sln b/OpenSim.sln
index 58be9fee99..aefeb45e7b 100644
--- a/OpenSim.sln
+++ b/OpenSim.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}"
@@ -43,139 +43,97 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
EndProject
Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectDependencies) = postSolution
- ({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000})
- ({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
- ({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
- ({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000})
- ({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000})
- ({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000})
- ({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
- ({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000})
- ({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000})
- ({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
- ({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
- ({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000})
- ({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000})
- ({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000})
- ({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
- ({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
- ({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
- ({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
- ({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
- ({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
- ({66591469-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})
- ({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000})
- ({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
- ({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
- ({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000})
- ({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
- ({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
- ({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
- ({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
- ({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
- ({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
- ({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
- ({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
- ({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000})
- ({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000})
- ({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000})
- ({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
- ({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
- ({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
- ({21BFC8E2-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000})
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
EndGlobal