OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small clean up of files and directories

0.1-prestable
MW 2007-04-25 13:03:48 +00:00
parent 46eaa79cd9
commit f7b51d63a8
56 changed files with 515 additions and 594 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

319
OpenGridServices.GridServer/SimProfiles.cs
View File

@ -41,88 +41,105 @@ using System.Xml;
namespace OpenGridServices.GridServer namespace OpenGridServices.GridServer
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
public class SimProfileManager { public class SimProfileManager
{
public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>();
private OpenGrid_Main m_gridManager;
public SimProfileManager(OpenGrid_Main gridManager) { public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>();
m_gridManager = gridManager; private OpenGrid_Main m_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 SimProfileBase GetProfileByHandle(ulong reqhandle) { public SimProfileManager(OpenGrid_Main gridManager)
foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) { {
if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID]; m_gridManager = gridManager;
} }
return null;
}
public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) { public void LoadProfiles()
foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) { { // should abstract this out
if(SimProfiles[UUID].UUID==ProfileLLUUID) return SimProfiles[UUID]; IObjectContainer db;
} db = Db4oFactory.OpenFile("simprofiles.yap");
return null; IObjectSet result = db.Get(typeof(SimProfileBase));
} foreach (SimProfileBase simprof in result)
{
public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) { SimProfiles.Add(simprof.UUID, simprof);
SimProfileBase TheSim=GetProfileByHandle(regionhandle); }
if(TheSim != null) MainConsole.Instance.WriteLine("SimProfiles.Cs:LoadProfiles() - Successfully loaded " + result.Count.ToString() + " from database");
if(TheSim.recvkey==simrecvkey) { db.Close();
return true; }
} else {
return false;
} else return false;
}
public string GetXMLNeighbours(ulong reqhandle) { public SimProfileBase GetProfileByHandle(ulong reqhandle)
string response=""; {
SimProfileBase central_region = GetProfileByHandle(reqhandle); foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys)
SimProfileBase neighbour; {
for(int x=-1; x<2; x++) for(int y=-1; y<2; y++) { if (SimProfiles[UUID].regionhandle == reqhandle) return SimProfiles[UUID];
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)); return null;
response+="<neighbour>"; }
response+="<sim_ip>" + neighbour.sim_ip + "</sim_ip>";
response+="<sim_port>" + neighbour.sim_port.ToString() + "</sim_port>";
response+="<locx>" + neighbour.RegionLocX.ToString() + "</locx>";
response+="<locy>" + neighbour.RegionLocY.ToString() + "</locy>";
response+="<regionhandle>" + neighbour.regionhandle.ToString() + "</regionhandle>";
response+="</neighbour>";
} public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID)
} {
return response; 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) { public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey)
SimProfileBase newprofile = new SimProfileBase(); {
newprofile.regionname=regionname; SimProfileBase TheSim = GetProfileByHandle(regionhandle);
newprofile.sim_ip=sim_ip; if (TheSim != null)
newprofile.sim_port=sim_port; if (TheSim.recvkey == simrecvkey)
newprofile.RegionLocX=RegionLocX; {
newprofile.RegionLocY=RegionLocY; return true;
newprofile.caps_url="http://" + sim_ip + ":9000/"; }
newprofile.sendkey=sendkey; else
newprofile.recvkey=recvkey; {
newprofile.regionhandle=Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); return false;
newprofile.UUID=LLUUID.Random(); }
this.SimProfiles.Add(newprofile.UUID,newprofile); else return false;
return newprofile;
} }
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 += "<neighbour>";
response += "<sim_ip>" + neighbour.sim_ip + "</sim_ip>";
response += "<sim_port>" + neighbour.sim_port.ToString() + "</sim_port>";
response += "<locx>" + neighbour.RegionLocX.ToString() + "</locx>";
response += "<locy>" + neighbour.RegionLocY.ToString() + "</locy>";
response += "<regionhandle>" + neighbour.regionhandle.ToString() + "</regionhandle>";
response += "</neighbour>";
}
}
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) 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) 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)); neighbour = GetProfileByHandle(Helpers.UIntsToLong((uint)((TheSim.RegionLocX + x) * 256), (uint)(TheSim.RegionLocY + y) * 256));
NeighbourBlock = new Hashtable(); NeighbourBlock = new Hashtable();
NeighbourBlock["sim_ip"] = neighbour.sim_ip; NeighbourBlock["sim_ip"] = neighbour.sim_ip;
NeighbourBlock["sim_port"] = neighbour.sim_port.ToString(); NeighbourBlock["sim_port"] = neighbour.sim_port.ToString();
NeighbourBlock["region_locx"] = neighbour.RegionLocX.ToString(); NeighbourBlock["region_locx"] = neighbour.RegionLocX.ToString();
NeighbourBlock["region_locy"] = neighbour.RegionLocY.ToString(); NeighbourBlock["region_locy"] = neighbour.RegionLocY.ToString();
NeighbourBlock["UUID"] = neighbour.UUID.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["regionname"] = TheSim.regionname;
responseData["estate_id"] = "1"; responseData["estate_id"] = "1";
responseData["neighbours"] = SimNeighboursData; responseData["neighbours"] = SimNeighboursData;
responseData["sim_ip"] = TheSim.sim_ip; responseData["sim_ip"] = TheSim.sim_ip;
responseData["sim_port"] = TheSim.sim_port.ToString(); responseData["sim_port"] = TheSim.sim_port.ToString();
responseData["asset_url"] = m_gridManager.Cfg.DefaultAssetServer; responseData["asset_url"] = m_gridManager.Cfg.DefaultAssetServer;
responseData["asset_sendkey"] = m_gridManager.Cfg.AssetSendKey; responseData["asset_sendkey"] = m_gridManager.Cfg.AssetSendKey;
responseData["asset_recvkey"] = m_gridManager.Cfg.AssetRecvKey; responseData["asset_recvkey"] = m_gridManager.Cfg.AssetRecvKey;
@ -193,97 +210,103 @@ namespace OpenGridServices.GridServer
public string RestSetSimMethod(string request, string path, string param) 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; SimProfileBase TheSim;
TheSim = GetProfileByLLUUID(new LLUUID(param)); TheSim = GetProfileByLLUUID(new LLUUID(param));
if ((TheSim) == null) { if ((TheSim) == null)
TheSim = new SimProfileBase(); {
LLUUID UUID = new LLUUID(param); TheSim = new SimProfileBase();
TheSim.UUID=UUID; LLUUID UUID = new LLUUID(param);
} TheSim.UUID = UUID;
}
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.LoadXml(request); doc.LoadXml(request);
XmlNode rootnode=doc.FirstChild; XmlNode rootnode = doc.FirstChild;
XmlNode authkeynode = rootnode.ChildNodes[0]; XmlNode authkeynode = rootnode.ChildNodes[0];
if (authkeynode.Name != "authkey") if (authkeynode.Name != "authkey")
{ {
return "ERROR! bad XML - expected authkey tag"; return "ERROR! bad XML - expected authkey tag";
} }
XmlNode simnode = rootnode.ChildNodes[1]; XmlNode simnode = rootnode.ChildNodes[1];
if (simnode.Name != "sim") 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) 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"; case "regionname":
} TheSim.regionname = simnode.ChildNodes[i].InnerText;
for (int i = 0; i < simnode.ChildNodes.Count; i++) { break;
switch (simnode.ChildNodes[i].Name) {
case "regionname":
TheSim.regionname = simnode.ChildNodes[i].InnerText;
break;
case "sim_ip": case "sim_ip":
TheSim.sim_ip = simnode.ChildNodes[i].InnerText; TheSim.sim_ip = simnode.ChildNodes[i].InnerText;
break; break;
case "sim_port": case "sim_port":
TheSim.sim_port = Convert.ToUInt32(simnode.ChildNodes[i].InnerText); TheSim.sim_port = Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
break; break;
case "region_locx": case "region_locx":
TheSim.RegionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); TheSim.RegionLocX = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256)); TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
break; break;
case "region_locy": case "region_locy":
TheSim.RegionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText); TheSim.RegionLocY = Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256)); TheSim.regionhandle = Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
break; break;
} }
} }
try { try
SimProfiles.Add(TheSim.UUID, TheSim); {
IObjectContainer db; SimProfiles.Add(TheSim.UUID, TheSim);
db = Db4oFactory.OpenFile("simprofiles.yap"); IObjectContainer db;
db.Set(TheSim); db = Db4oFactory.OpenFile("simprofiles.yap");
db.Close(); db.Set(TheSim);
return "OK"; db.Close();
} catch(Exception e) { return "OK";
return "ERROR! could not save to database!"; }
} 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 ) public string RestGetRegionMethod(string request, string path, string param)
{ {
SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param)); SimProfileBase TheSim = GetProfileByHandle((ulong)Convert.ToUInt64(param));
return RestSetSimMethod("", "/sims/", param); return RestGetSimMethod("", "/sims/", param);
} }
public string RestGetSimMethod(string request, string path, string 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; string respstring = String.Empty;
SimProfileBase TheSim; SimProfileBase TheSim;
LLUUID UUID = new LLUUID(param); LLUUID UUID = new LLUUID(param);
TheSim = GetProfileByLLUUID(UUID); TheSim = GetProfileByLLUUID(UUID);
if (!(TheSim == null)) if (!(TheSim == null))
{ {
respstring = "<Root>"; respstring = "<Root>";
respstring += "<authkey>" + m_gridManager.Cfg.SimSendKey + "</authkey>"; respstring += "<authkey>" + m_gridManager.Cfg.SimSendKey + "</authkey>";
respstring += "<sim>"; respstring += "<sim>";
respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>"; respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>";
respstring += "<regionname>" + TheSim.regionname + "</regionname>"; respstring += "<regionname>" + TheSim.regionname + "</regionname>";
@ -293,13 +316,13 @@ namespace OpenGridServices.GridServer
respstring += "<region_locy>" + TheSim.RegionLocY.ToString() + "</region_locy>"; respstring += "<region_locy>" + TheSim.RegionLocY.ToString() + "</region_locy>";
respstring += "<estate_id>1</estate_id>"; respstring += "<estate_id>1</estate_id>";
respstring += "</sim>"; respstring += "</sim>";
respstring += "</Root>"; respstring += "</Root>";
} }
return respstring; return respstring;
} }
} }
} }

2
OpenSim.Framework/AgentInventory.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
namespace OpenSim.Framework.Inventory namespace OpenSim.Framework.Inventory
{ {

2
OpenSim.Framework/IAssetServer.cs → OpenSim.Framework/Interfaces/IAssetServer.cs
View File

@ -30,7 +30,7 @@ using System.Net.Sockets;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces namespace OpenSim.Framework.Interfaces
{ {

0
OpenSim.Framework/IConfig.cs → OpenSim.Framework/Interfaces/IConfig.cs
View File

0
OpenSim.Framework/IGenericConfig.cs → OpenSim.Framework/Interfaces/IGenericConfig.cs
View File

0
OpenSim.Framework/IGridConfig.cs → OpenSim.Framework/Interfaces/IGridConfig.cs
View File

5
OpenSim.Framework/IGridServer.cs → OpenSim.Framework/Interfaces/IGridServer.cs
View File

@ -27,13 +27,14 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.IO; using System.IO;
using libsecondlife; using libsecondlife;
using OpenSim; using OpenSim;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces namespace OpenSim.Framework.Interfaces
{ {
@ -51,7 +52,7 @@ namespace OpenSim.Framework.Interfaces
string GetName(); string GetName();
bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port); bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
void Close(); void Close();
} }
public struct UUIDBlock public struct UUIDBlock

2
OpenSim.Framework/ILocalStorage.cs → OpenSim.Framework/Interfaces/ILocalStorage.cs
View File

@ -27,7 +27,7 @@
using System; using System;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces namespace OpenSim.Framework.Interfaces
{ {

1
OpenSim.Framework/IScriptAPI.cs → OpenSim.Framework/Interfaces/IScriptAPI.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces namespace OpenSim.Framework.Interfaces
{ {

0
OpenSim.Framework/IScriptEngine.cs → OpenSim.Framework/Interfaces/IScriptEngine.cs
View File

0
OpenSim.Framework/IUserConfig.cs → OpenSim.Framework/Interfaces/IUserConfig.cs
View File

0
OpenSim.Framework/IUserServer.cs → OpenSim.Framework/Interfaces/IUserServer.cs
View File

1
OpenSim.Framework/LocalGridBase.cs → OpenSim.Framework/Interfaces/LocalGridBase.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces namespace OpenSim.Framework.Interfaces
{ {

21
OpenSim.Framework/RemoteGridBase.cs → OpenSim.Framework/Interfaces/RemoteGridBase.cs
View File

@ -1,8 +1,9 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Types;
namespace OpenSim.Framework.Interfaces 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 bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey); public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
public abstract void Close(); public abstract void Close();
public abstract Hashtable GridData { public abstract Hashtable GridData {
get; get;
set; set;
} }
public abstract ArrayList neighbours { public abstract ArrayList neighbours {
get; get;
set; set;
} }
} }
} }

108
OpenSim.Framework/OpenSim.Framework.csproj
View File

@ -78,72 +78,18 @@
<ItemGroup> <ItemGroup>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AgentInventory.cs"> <Compile Include="AgentInventory.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="AssetBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="BlockingQueue.cs"> <Compile Include="BlockingQueue.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="HeightMapGenHills.cs"> <Compile Include="HeightMapGenHills.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="IAssetServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IGenericConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IGridServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ILocalStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IScriptAPI.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IScriptEngine.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IUserConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LocalGridBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Login.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LoginService.cs"> <Compile Include="LoginService.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="NeighbourInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OSVector3.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="PrimData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RemoteGridBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfile.cs"> <Compile Include="SimProfile.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -162,9 +108,63 @@
<Compile Include="Util.cs"> <Compile Include="Util.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\IAssetServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IGenericConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IGridServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\ILocalStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IScriptAPI.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IScriptEngine.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IUserConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\LocalGridBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\RemoteGridBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\Login.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NeighbourInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\OSVector3.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\PrimData.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>

36
OpenSim.Framework/OpenSim.Framework.dll.build
View File

@ -11,35 +11,35 @@
<resources prefix="OpenSim.Framework" dynamicprefix="true" > <resources prefix="OpenSim.Framework" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AgentCiruitData.cs" />
<include name="AgentInventory.cs" /> <include name="AgentInventory.cs" />
<include name="AssetBase.cs" />
<include name="BlockingQueue.cs" /> <include name="BlockingQueue.cs" />
<include name="HeightMapGenHills.cs" /> <include name="HeightMapGenHills.cs" />
<include name="IAssetServer.cs" />
<include name="IConfig.cs" />
<include name="IGenericConfig.cs" />
<include name="IGridConfig.cs" />
<include name="IGridServer.cs" />
<include name="ILocalStorage.cs" />
<include name="IScriptAPI.cs" />
<include name="IScriptEngine.cs" />
<include name="IUserConfig.cs" />
<include name="IUserServer.cs" />
<include name="LocalGridBase.cs" />
<include name="Login.cs" />
<include name="LoginService.cs" /> <include name="LoginService.cs" />
<include name="NeighbourInfo.cs" />
<include name="OSVector3.cs" />
<include name="PrimData.cs" />
<include name="RemoteGridBase.cs" />
<include name="SimProfile.cs" /> <include name="SimProfile.cs" />
<include name="SimProfileBase.cs" /> <include name="SimProfileBase.cs" />
<include name="UserProfile.cs" /> <include name="UserProfile.cs" />
<include name="UserProfileManager.cs" /> <include name="UserProfileManager.cs" />
<include name="UserProfileManagerBase.cs" /> <include name="UserProfileManagerBase.cs" />
<include name="Util.cs" /> <include name="Util.cs" />
<include name="Interfaces/IAssetServer.cs" />
<include name="Interfaces/IConfig.cs" />
<include name="Interfaces/IGenericConfig.cs" />
<include name="Interfaces/IGridConfig.cs" />
<include name="Interfaces/IGridServer.cs" />
<include name="Interfaces/ILocalStorage.cs" />
<include name="Interfaces/IScriptAPI.cs" />
<include name="Interfaces/IScriptEngine.cs" />
<include name="Interfaces/IUserConfig.cs" />
<include name="Interfaces/IUserServer.cs" />
<include name="Interfaces/LocalGridBase.cs" />
<include name="Interfaces/RemoteGridBase.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
<include name="Types/AgentCiruitData.cs" />
<include name="Types/AssetBase.cs" />
<include name="Types/Login.cs" />
<include name="Types/NeighbourInfo.cs" />
<include name="Types/OSVector3.cs" />
<include name="Types/PrimData.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

4
OpenSim.Framework/SimProfile.cs
View File

@ -41,7 +41,7 @@ namespace OpenSim.Framework.Sims
} }
return this; return this;
} }
public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey) public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
{ {
try try
@ -73,7 +73,7 @@ namespace OpenSim.Framework.Sims
} }
return this; return this;
} }
public SimProfile() public SimProfile()
{ {

4
OpenSim.Framework/AgentCiruitData.cs → OpenSim.Framework/Types/AgentCiruitData.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework.Interfaces namespace OpenSim.Framework.Types
{ {
public class AgentCircuitData public class AgentCircuitData
{ {
@ -11,7 +11,7 @@ namespace OpenSim.Framework.Interfaces
public LLUUID AgentID; public LLUUID AgentID;
public LLUUID SessionID; public LLUUID SessionID;
public LLUUID SecureSessionID; public LLUUID SecureSessionID;
public LLVector3 startpos; public LLVector3 startpos;
public string firstname; public string firstname;
public string lastname; public string lastname;
public uint circuitcode; public uint circuitcode;

2
OpenSim.Framework/AssetBase.cs → OpenSim.Framework/Types/AssetBase.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework.Assets namespace OpenSim.Framework.Types
{ {
public class AssetBase public class AssetBase
{ {

2
OpenSim.Framework/Login.cs → OpenSim.Framework/Types/Login.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework.Interfaces namespace OpenSim.Framework.Types
{ {
public class Login public class Login
{ {

2
OpenSim.Framework/NeighbourInfo.cs → OpenSim.Framework/Types/NeighbourInfo.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace OpenSim.Framework.Interfaces namespace OpenSim.Framework.Types
{ {
public class NeighbourInfo public class NeighbourInfo
{ {

2
OpenSim.Framework/OSVector3.cs → OpenSim.Framework/Types/OSVector3.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
namespace OpenSim.Framework namespace OpenSim.Framework.Types
{ {
public class OSVector3 public class OSVector3
{ {

2
OpenSim.Framework/PrimData.cs → OpenSim.Framework/Types/PrimData.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using libsecondlife; using libsecondlife;
namespace OpenSim.Framework.Assets namespace OpenSim.Framework.Types
{ {
public class PrimData public class PrimData
{ {

2
OpenSim.Framework/UserProfile.cs
View File

@ -32,7 +32,7 @@ namespace OpenSim.Framework.User
Circuits = new Dictionary<LLUUID, uint>(); Circuits = new Dictionary<LLUUID, uint>();
Inventory = new AgentInventory(); Inventory = new AgentInventory();
homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256));
homepos = new LLVector3(); homepos = new LLVector3();
homelookat = new LLVector3(); homelookat = new LLVector3();
} }

14
OpenSim.Framework/UserProfileManager.cs
View File

@ -106,7 +106,7 @@ namespace OpenSim.Framework.User
LLUUID AgentID = TheUser.UUID; LLUUID AgentID = TheUser.UUID;
TheUser.InitSessionData(); 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) //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(); //SimProfile SimInfo = new SimProfile();
//SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey); //SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
@ -140,7 +140,7 @@ namespace OpenSim.Framework.User
ArrayList AgentInventory = new ArrayList(); ArrayList AgentInventory = new ArrayList();
Console.WriteLine("adding inventory to response"); Console.WriteLine("adding inventory to response");
Hashtable TempHash; Hashtable TempHash;
foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values) foreach (InventoryFolder InvFolder in TheUser.Inventory.InventoryFolders.Values)
{ {
TempHash = new Hashtable(); TempHash = new Hashtable();
@ -200,7 +200,7 @@ namespace OpenSim.Framework.User
this.CustomiseResponse(ref responseData, TheUser); this.CustomiseResponse(ref responseData, TheUser);
response.Value = responseData; response.Value = responseData;
// TheUser.SendDataToSim(SimInfo); // TheUser.SendDataToSim(SimInfo);
return response; return response;
} }
@ -211,7 +211,7 @@ namespace OpenSim.Framework.User
//} //}
} }
return response; return response;
} }
private static XmlRpcResponse CreateErrorConnectingToGridResponse() private static XmlRpcResponse CreateErrorConnectingToGridResponse()
@ -258,9 +258,9 @@ namespace OpenSim.Framework.User
SimParams["firstname"] = theUser.firstname; SimParams["firstname"] = theUser.firstname;
SimParams["lastname"] = theUser.lastname; SimParams["lastname"] = theUser.lastname;
SimParams["agent_id"] = theUser.UUID.ToString(); SimParams["agent_id"] = theUser.UUID.ToString();
SimParams["circuit_code"] = (Int32)circode; SimParams["circuit_code"] = (Int32)circode;
SimParams["startpos_x"] = theUser.homepos.X.ToString(); SimParams["startpos_x"] = theUser.homepos.X.ToString();
SimParams["startpos_y"] = theUser.homepos.Y.ToString(); SimParams["startpos_y"] = theUser.homepos.Y.ToString();
SimParams["startpos_z"] = theUser.homepos.Z.ToString(); SimParams["startpos_z"] = theUser.homepos.Z.ToString();
ArrayList SendParams = new ArrayList(); ArrayList SendParams = new ArrayList();
SendParams.Add(SimParams); SendParams.Add(SimParams);

3
OpenSim.Framework/UserProfileManagerBase.cs
View File

@ -103,7 +103,8 @@ namespace OpenSim.Framework.User
newprofile.firstname = firstname; newprofile.firstname = firstname;
newprofile.lastname = lastname; newprofile.lastname = lastname;
newprofile.MD5passwd = MD5passwd; 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); this.UserProfiles.Add(newprofile.UUID, newprofile);
return newprofile; return newprofile;
} }

2
OpenSim.GridInterfaces/Local/LocalAssetServer.cs
View File

@ -4,7 +4,7 @@ using System.Text;
using System.Threading; using System.Threading;
using System.IO; using System.IO;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using libsecondlife; using libsecondlife;
using Db4objects.Db4o; using Db4objects.Db4o;

2
OpenSim.GridInterfaces/Local/LocalGridServer.cs
View File

@ -29,7 +29,7 @@ using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.IO; using System.IO;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using libsecondlife; using libsecondlife;
using Db4objects.Db4o; using Db4objects.Db4o;
using Db4objects.Db4o.Query; using Db4objects.Db4o.Query;

2
OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
View File

@ -7,7 +7,7 @@ using System.Net.Sockets;
using System.IO; using System.IO;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
namespace OpenSim.GridInterfaces.Remote namespace OpenSim.GridInterfaces.Remote

22
OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
View File

@ -34,7 +34,7 @@ using System.IO;
using libsecondlife; using libsecondlife;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
namespace OpenSim.GridInterfaces.Remote namespace OpenSim.GridInterfaces.Remote
{ {
@ -44,28 +44,28 @@ namespace OpenSim.GridInterfaces.Remote
private string GridSendKey; private string GridSendKey;
private string GridRecvKey; private string GridRecvKey;
private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>(); private Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
private ArrayList simneighbours = new ArrayList(); private ArrayList simneighbours = new ArrayList();
private Hashtable griddatahash; private Hashtable griddatahash;
public override Dictionary<uint, AgentCircuitData> agentcircuits public override Dictionary<uint, AgentCircuitData> agentcircuits
{ {
get { return AgentCircuits; } get { return AgentCircuits; }
set { AgentCircuits = value; } set { AgentCircuits = value; }
} }
public override ArrayList neighbours public override ArrayList neighbours
{ {
get { return simneighbours; } get { return simneighbours; }
set { simneighbours = value; } set { simneighbours = value; }
} }
public override Hashtable GridData public override Hashtable GridData
{ {
get { return griddatahash; } get { return griddatahash; }
set { griddatahash = value; } set { griddatahash = value; }
} }
public RemoteGridServer() public RemoteGridServer()
{ {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created"); 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); XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000); XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);
Hashtable GridRespData = (Hashtable)GridResp.Value; Hashtable GridRespData = (Hashtable)GridResp.Value;
this.griddatahash=GridRespData; this.griddatahash=GridRespData;
if(GridRespData.ContainsKey("error")) { if(GridRespData.ContainsKey("error")) {
string errorstring = (string)GridRespData["error"]; string errorstring = (string)GridRespData["error"];
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:"); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring); OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring);
return false; return false;
} }
this.neighbours = (ArrayList)GridRespData["neighbours"]; this.neighbours = (ArrayList)GridRespData["neighbours"];
Console.WriteLine(simneighbours.Count); Console.WriteLine(simneighbours.Count);
return true; return true;
} }

2
OpenSim.RegionServer/AgentAssetUpload.cs
View File

@ -2,7 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using OpenSim.Assets; using OpenSim.Assets;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;

2
OpenSim.RegionServer/Assets/AssetCache.cs
View File

@ -32,7 +32,7 @@ using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim; using OpenSim;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
namespace OpenSim.Assets namespace OpenSim.Assets

6
OpenSim.RegionServer/Assets/InventoryCache.cs
View File

@ -32,7 +32,7 @@ using OpenSim;
using libsecondlife.Packets; using libsecondlife.Packets;
//using OpenSim.GridServers; //using OpenSim.GridServers;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
namespace OpenSim.Assets namespace OpenSim.Assets
@ -125,7 +125,7 @@ namespace OpenSim.Assets
return res; 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; LLUUID newItem = null;
if (this._agentsInventory.ContainsKey(remoteClient.AgentID)) if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
@ -161,7 +161,7 @@ namespace OpenSim.Assets
return res; 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)) if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
{ {

0
OpenSim.RegionServer/ConsoleCmds.cs
View File

15
OpenSim.RegionServer/OpenSim.RegionServer.csproj
View File

@ -121,9 +121,6 @@
<Compile Include="AgentAssetUpload.cs"> <Compile Include="AgentAssetUpload.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ConsoleCmds.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Grid.cs"> <Compile Include="Grid.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -145,9 +142,6 @@
<Compile Include="SimClient.cs"> <Compile Include="SimClient.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="SimConsole.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="VersionInfo.cs"> <Compile Include="VersionInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -187,12 +181,6 @@
<Compile Include="world\Primitive2.cs"> <Compile Include="world\Primitive2.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world\ScriptEngine.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="world\SurfacePatch.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="world\World.cs"> <Compile Include="world\World.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -202,9 +190,6 @@
<Compile Include="world\WorldScripting.cs"> <Compile Include="world\WorldScripting.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="world\scripting\IScript.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="world\scripting\IScriptContext.cs"> <Compile Include="world\scripting\IScriptContext.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

5
OpenSim.RegionServer/OpenSim.RegionServer.dll.build
View File

@ -12,7 +12,6 @@
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AgentAssetUpload.cs" /> <include name="AgentAssetUpload.cs" />
<include name="ConsoleCmds.cs" />
<include name="Grid.cs" /> <include name="Grid.cs" />
<include name="OpenSimMain.cs" /> <include name="OpenSimMain.cs" />
<include name="OpenSimNetworkHandler.cs" /> <include name="OpenSimNetworkHandler.cs" />
@ -20,7 +19,6 @@
<include name="QueItem.cs" /> <include name="QueItem.cs" />
<include name="RegionInfo.cs" /> <include name="RegionInfo.cs" />
<include name="SimClient.cs" /> <include name="SimClient.cs" />
<include name="SimConsole.cs" />
<include name="VersionInfo.cs" /> <include name="VersionInfo.cs" />
<include name="Assets/AssetCache.cs" /> <include name="Assets/AssetCache.cs" />
<include name="Assets/InventoryCache.cs" /> <include name="Assets/InventoryCache.cs" />
@ -34,12 +32,9 @@
<include name="world/Entity.cs" /> <include name="world/Entity.cs" />
<include name="world/Primitive.cs" /> <include name="world/Primitive.cs" />
<include name="world/Primitive2.cs" /> <include name="world/Primitive2.cs" />
<include name="world/ScriptEngine.cs" />
<include name="world/SurfacePatch.cs" />
<include name="world/World.cs" /> <include name="world/World.cs" />
<include name="world/WorldPacketHandlers.cs" /> <include name="world/WorldPacketHandlers.cs" />
<include name="world/WorldScripting.cs" /> <include name="world/WorldScripting.cs" />
<include name="world/scripting/IScript.cs" />
<include name="world/scripting/IScriptContext.cs" /> <include name="world/scripting/IScriptContext.cs" />
<include name="world/scripting/IScriptEntity.cs" /> <include name="world/scripting/IScriptEntity.cs" />
<include name="world/scripting/IScriptHandler.cs" /> <include name="world/scripting/IScriptHandler.cs" />

22
OpenSim.RegionServer/OpenSimMain.cs
View File

@ -41,6 +41,7 @@ using libsecondlife.Packets;
using OpenSim.world; using OpenSim.world;
using OpenSim.Terrain; using OpenSim.Terrain;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using OpenSim.UserServer; using OpenSim.UserServer;
using OpenSim.Assets; using OpenSim.Assets;
using OpenSim.CAPS; using OpenSim.CAPS;
@ -82,7 +83,7 @@ namespace OpenSim
public string m_physicsEngine; public string m_physicsEngine;
public bool m_sandbox = false; public bool m_sandbox = false;
public bool m_loginserver; public bool m_loginserver;
public OpenGridProtocolServer OGSServer; public OpenGridProtocolServer OGSServer;
public bool user_accounts = false; public bool user_accounts = false;
public bool gridLocalAsset = false; public bool gridLocalAsset = false;
@ -205,8 +206,8 @@ namespace OpenSim
if (gridServer.GetName() == "Remote") if (gridServer.GetName() == "Remote")
{ {
// should startup the OGS protocol server here // should startup the OGS protocol server here
OGSServer = new OpenGridProtocolServer(8500); //OGSServer = new OpenGridProtocolServer(8500);
// we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
httpServer.AddXmlRPCHandler("expect_user", httpServer.AddXmlRPCHandler("expect_user",
@ -298,12 +299,13 @@ namespace OpenSim
m_console.WriteLine("Main.cs:Startup() - Starting HTTP server"); m_console.WriteLine("Main.cs:Startup() - Starting HTTP server");
httpServer.Start(); httpServer.Start();
if(gridServer.GetName() == "Remote") { if (gridServer.GetName() == "Remote")
m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server"); {
OGSServer.Start(); m_console.WriteLine("Main.cs:Startup() - Starting up OGS protocol server");
} OGSServer.Start();
}
MainServerListener(); MainServerListener();
m_heartbeatTimer.Enabled = true; m_heartbeatTimer.Enabled = true;
@ -523,7 +525,7 @@ namespace OpenSim
case "terrain": case "terrain":
string result = ""; string result = "";
if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams,ref result)) if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
{ {
m_console.WriteLine(result); m_console.WriteLine(result);
} }

2
OpenSim.RegionServer/SimClient.cs
View File

@ -36,7 +36,7 @@ using System.IO;
using System.Threading; using System.Threading;
using System.Timers; using System.Timers;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using OpenSim.world; using OpenSim.world;

0
OpenSim.RegionServer/SimConsole.cs
View File

2
OpenSim.RegionServer/world/Primitive.cs
View File

@ -6,7 +6,7 @@ using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Physics.Manager; using OpenSim.Physics.Manager;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
namespace OpenSim.world namespace OpenSim.world
{ {

2
OpenSim.RegionServer/world/Primitive2.cs
View File

@ -6,7 +6,7 @@ using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Physics.Manager; using OpenSim.Physics.Manager;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
namespace OpenSim.world namespace OpenSim.world

18
OpenSim.RegionServer/world/ScriptEngine.cs
View File

@ -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()
{
}
}
}

22
OpenSim.RegionServer/world/SurfacePatch.cs
View File

@ -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;
}
}
}
}

6
OpenSim.RegionServer/world/World.cs
View File

@ -8,11 +8,11 @@ using System.IO;
using System.Threading; using System.Threading;
using OpenSim.Physics.Manager; using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain; using OpenSim.Framework.Terrain;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
using OpenSim.Assets; using OpenSim.Assets;
using OpenSim.world.scripting; //using OpenSim.world.scripting;
using OpenSim.RegionServer.world.scripting; using OpenSim.RegionServer.world.scripting;
using OpenSim.RegionServer.world.scripting.Scripts; using OpenSim.RegionServer.world.scripting.Scripts;
using OpenSim.Terrain; using OpenSim.Terrain;
@ -25,7 +25,7 @@ namespace OpenSim.world
public Dictionary<libsecondlife.LLUUID, Entity> Entities; public Dictionary<libsecondlife.LLUUID, Entity> Entities;
public Dictionary<libsecondlife.LLUUID, Avatar> Avatars; public Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
public Dictionary<libsecondlife.LLUUID, Primitive> Prims; public Dictionary<libsecondlife.LLUUID, Primitive> Prims;
public ScriptEngine Scripts; //public ScriptEngine Scripts;
public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
public uint _localNumber = 0; public uint _localNumber = 0;
private PhysicsScene phyScene; private PhysicsScene phyScene;

2
OpenSim.RegionServer/world/WorldPacketHandlers.cs
View File

@ -5,7 +5,7 @@ using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using OpenSim.Physics.Manager; using OpenSim.Physics.Manager;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain; using OpenSim.Framework.Terrain;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
using OpenSim.Assets; using OpenSim.Assets;

1
OpenSim.RegionServer/world/WorldScripting.cs
View File

@ -5,6 +5,7 @@ using System.IO;
using System.Reflection; using System.Reflection;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using libsecondlife; using libsecondlife;
namespace OpenSim.world namespace OpenSim.world

16
OpenSim.RegionServer/world/scripting/IScript.cs
View File

@ -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();
}
}

1
OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
View File

@ -5,6 +5,7 @@ using OpenSim.Scripting.EmbeddedJVM.Types;
using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes; using OpenSim.Scripting.EmbeddedJVM.Types.PrimitiveTypes;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Types;
namespace OpenSim.Scripting.EmbeddedJVM namespace OpenSim.Scripting.EmbeddedJVM
{ {

1
OpenSim.Servers/LocalUserProfileManager.cs
View File

@ -33,6 +33,7 @@ using OpenSim.Framework.User;
using OpenSim.Framework.Grid; using OpenSim.Framework.Grid;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Types;
using libsecondlife; using libsecondlife;
namespace OpenSim.UserServer namespace OpenSim.UserServer

1
OpenSim.Servers/LoginServer.cs
View File

@ -43,6 +43,7 @@ using OpenSim.Framework.Grid;
using OpenSim.Framework.Inventory; using OpenSim.Framework.Inventory;
using OpenSim.Framework.User; using OpenSim.Framework.User;
using OpenSim.Framework.Utilities; using OpenSim.Framework.Utilities;
using OpenSim.Framework.Types;
namespace OpenSim.UserServer namespace OpenSim.UserServer
{ {

183
OpenSim.Servers/OpenGridProtocol.cs
View File

@ -1,89 +1,94 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using System.Collections; using System.Collections;
namespace OpenSim.Servers namespace OpenSim.Servers
{ {
public class OpenGridProtocolServer public class OpenGridProtocolServer
{ {
private Thread m_workerThread; private Thread m_workerThread;
private Socket m_listenerSocket; private Socket m_listenerSocket;
private IPEndPoint m_IPendpoint; private IPEndPoint m_IPendpoint;
private int m_port; private int m_port;
private ArrayList m_clients; private ArrayList m_clients;
private class ClientHandler { private class ClientHandler
private Thread m_clientThread; {
private Socket m_socketHandle; private Thread m_clientThread;
private Socket m_socketHandle;
public ClientHandler(Socket clientSocketHandle) {
m_socketHandle=clientSocketHandle; public ClientHandler(Socket clientSocketHandle)
m_clientThread = new Thread(new ThreadStart(DoWork)); {
m_clientThread.IsBackground = true; m_socketHandle = clientSocketHandle;
m_clientThread.Start(); 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 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); private void WriteLine(string theline)
} {
} theline += "\n";
byte[] thelinebuffer = System.Text.Encoding.ASCII.GetBytes(theline.ToCharArray());
public OpenGridProtocolServer(int port) m_socketHandle.Send(thelinebuffer, theline.Length, 0);
{ }
m_port = port; }
}
public OpenGridProtocolServer(int port)
public void Start() {
{ m_port = port;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: Start() - Opening server socket"); }
m_clients = new ArrayList(); public void Start()
m_workerThread = new Thread(new ThreadStart(StartServerSocket)); {
m_workerThread.IsBackground = true; OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: Start() - Opening server socket");
m_workerThread.Start();
} m_clients = new ArrayList();
m_workerThread = new Thread(new ThreadStart(StartServerSocket));
private void StartServerSocket() m_workerThread.IsBackground = true;
{ m_workerThread.Start();
try }
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK"); private void StartServerSocket()
{
try
m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port); {
m_listenerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK");
m_listenerSocket.Bind(m_IPendpoint);
m_listenerSocket.Listen(4);
m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port);
Socket sockethandle; m_listenerSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
while (true) m_listenerSocket.Bind(m_IPendpoint);
{ m_listenerSocket.Listen(4);
sockethandle = m_listenerSocket.Accept();
lock(m_clients.SyncRoot) { Socket sockethandle;
m_clients.Add(new OpenGridProtocolServer.ClientHandler(sockethandle)); while (true)
} {
} sockethandle = m_listenerSocket.Accept();
} lock (m_clients.SyncRoot)
catch (Exception e) {
{ m_clients.Add(new OpenGridProtocolServer.ClientHandler(sockethandle));
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message); }
} }
} }
} catch (Exception e)
} {
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message);
}
}
}
}

2
OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
View File

@ -33,7 +33,7 @@ using System.Collections.Generic;
using System.Data; using System.Data;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain; using OpenSim.Framework.Terrain;
using BerkeleyDb; using BerkeleyDb;
using Kds.Serialization; using Kds.Serialization;

2
OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
View File

@ -30,7 +30,7 @@ using Db4objects.Db4o;
using Db4objects.Db4o.Query; using Db4objects.Db4o.Query;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain; using OpenSim.Framework.Terrain;
namespace OpenSim.Storage.LocalStorageDb4o namespace OpenSim.Storage.LocalStorageDb4o

2
OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
View File

@ -5,7 +5,7 @@ using Db4objects.Db4o;
using Db4objects.Db4o.Query; using Db4objects.Db4o.Query;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
namespace OpenSim.Storage.LocalStorageDb4o namespace OpenSim.Storage.LocalStorageDb4o
{ {

2
OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
View File

@ -34,7 +34,7 @@ using System.Data;
using System.Data.SQLite; using System.Data.SQLite;
using libsecondlife; using libsecondlife;
using OpenSim.Framework.Interfaces; using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Assets; using OpenSim.Framework.Types;
using OpenSim.Framework.Terrain; using OpenSim.Framework.Terrain;
namespace OpenSim.Storage.LocalStorageSQLite namespace OpenSim.Storage.LocalStorageSQLite

230
OpenSim.sln
View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00 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}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Terrain.BasicTerrain", "OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj", "{2270B8FE-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.RegionServer", "OpenSim.RegionServer\OpenSim.RegionServer.csproj", "{632E1BFD-0000-0000-0000-000000000000}" 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}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenGridServices.GridServer", "OpenGridServices.GridServer\OpenGridServices.GridServer.csproj", "{21BFC8E2-0000-0000-0000-000000000000}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
({632E1BFD-0000-0000-0000-000000000000}).5 = ({2270B8FE-0000-0000-0000-000000000000}) {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({632E1BFD-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) {2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({632E1BFD-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({632E1BFD-0000-0000-0000-000000000000}).8 = ({E88EF749-0000-0000-0000-000000000000}) {2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({632E1BFD-0000-0000-0000-000000000000}).9 = ({8BE16150-0000-0000-0000-000000000000}) {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({632E1BFD-0000-0000-0000-000000000000}).10 = ({8BB20F0A-0000-0000-0000-000000000000}) {632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({63A05FE9-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({EE9E5D96-0000-0000-0000-000000000000}).6 = ({8ACA2445-0000-0000-0000-000000000000}) {632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({EE9E5D96-0000-0000-0000-000000000000}).7 = ({A7CD0630-0000-0000-0000-000000000000}) {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) {63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({438A9556-0000-0000-0000-000000000000}).7 = ({8BE16150-0000-0000-0000-000000000000}) {63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({438A9556-0000-0000-0000-000000000000}).8 = ({8BB20F0A-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({438A9556-0000-0000-0000-000000000000}).9 = ({632E1BFD-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({E88EF749-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({8BE16150-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) {A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({8BE16150-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({97A82740-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) {EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({66591469-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({66591469-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) {EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({66591469-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({4F874463-0000-0000-0000-000000000000}).2 = ({8BE16150-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({B0027747-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({B0027747-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) {438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({988F0AC4-0000-0000-0000-000000000000}).3 = ({8BE16150-0000-0000-0000-000000000000}) {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({B55C0B5D-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) {E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({B55C0B5D-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({8BB20F0A-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000}) {E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({8BB20F0A-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000}) {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({E1B79ECF-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) {8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({E1B79ECF-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({6B20B603-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) {8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({6B20B603-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({7E494328-0000-0000-0000-000000000000}).5 = ({8ACA2445-0000-0000-0000-000000000000}) {97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({7E494328-0000-0000-0000-000000000000}).6 = ({A7CD0630-0000-0000-0000-000000000000}) {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({546099CD-0000-0000-0000-000000000000}).4 = ({8ACA2445-0000-0000-0000-000000000000}) {97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({546099CD-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000}) {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({21BFC8E2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000}) {66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({21BFC8E2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000}) {66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({21BFC8E2-0000-0000-0000-000000000000}).5 = ({8BB20F0A-0000-0000-0000-000000000000}) {66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
GlobalSection(ProjectConfigurationPlatforms) = postSolution {4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2270B8FE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2270B8FE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{632E1BFD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {B0027747-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{632E1BFD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {988F0AC4-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{63A05FE9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {988F0AC4-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{63A05FE9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {B55C0B5D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A7CD0630-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {B55C0B5D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A7CD0630-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {8ACA2445-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE9E5D96-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {8ACA2445-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE9E5D96-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {8BB20F0A-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {8BB20F0A-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{438A9556-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {E1B79ECF-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E88EF749-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {E1B79ECF-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E88EF749-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {6B20B603-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8BE16150-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B20B603-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8BE16150-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {7E494328-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{97A82740-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {7E494328-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{97A82740-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{97A82740-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {546099CD-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{66591469-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{66591469-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {546099CD-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{66591469-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{66591469-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {21BFC8E2-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F874463-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {21BFC8E2-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{4F874463-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection
{4F874463-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU GlobalSection(SolutionProperties) = preSolution
{B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU HideSolutionNode = FALSE
{B0027747-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection
{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 EndGlobal