aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/OpenSim.Caches/AssetCache.cs1
-rw-r--r--OpenSim/OpenSim.Region/Caps.cs52
-rw-r--r--OpenSim/OpenSim/OpenSim.csproj65
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs5
4 files changed, 87 insertions, 36 deletions
diff --git a/OpenSim/OpenSim.Caches/AssetCache.cs b/OpenSim/OpenSim.Caches/AssetCache.cs
index f310752..d0cc370 100644
--- a/OpenSim/OpenSim.Caches/AssetCache.cs
+++ b/OpenSim/OpenSim.Caches/AssetCache.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework.Utilities;
39namespace OpenSim.Caches 39namespace OpenSim.Caches
40{ 40{
41 public delegate void DownloadComplete(AssetCache.TextureSender sender); 41 public delegate void DownloadComplete(AssetCache.TextureSender sender);
42
42 /// <summary> 43 /// <summary>
43 /// Manages local cache of assets and their sending to viewers. 44 /// Manages local cache of assets and their sending to viewers.
44 /// </summary> 45 /// </summary>
diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs
index 59f24e3..7ec0c75 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/OpenSim.Region/Caps.cs
@@ -22,9 +22,11 @@ namespace OpenSim.Region
22 private string mapLayerPath = "0001/"; 22 private string mapLayerPath = "0001/";
23 private string newInventory = "0002/"; 23 private string newInventory = "0002/";
24 private string requestTexture = "0003/"; 24 private string requestTexture = "0003/";
25 private string eventQueue = "0100/";
25 private BaseHttpServer httpListener; 26 private BaseHttpServer httpListener;
26 private LLUUID agentID; 27 private LLUUID agentID;
27 private AssetCache assetCache; 28 private AssetCache assetCache;
29 private int eventQueueCount = 1;
28 30
29 public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent) 31 public Caps(AssetCache assetCach, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, LLUUID agent)
30 { 32 {
@@ -45,6 +47,7 @@ namespace OpenSim.Region
45 httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest); 47 httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + requestPath, CapsRequest);
46 httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer); 48 httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + mapLayerPath, MapLayer);
47 httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory); 49 httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + newInventory, NewAgentInventory);
50 httpListener.AddRestHandler("POST", "/CAPS/" + capsObjectPath + eventQueue, ProcessEventQueue);
48 } 51 }
49 52
50 /// <summary> 53 /// <summary>
@@ -74,6 +77,7 @@ namespace OpenSim.Region
74 capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>"; 77 capURLS += "<key>MapLayer</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + mapLayerPath + "</string>";
75 capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>"; 78 capURLS += "<key>NewFileAgentInventory</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + newInventory + "</string>";
76 //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>"; 79 //capURLS += "<key>RequestTextureDownload</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + requestTexture + "</string>";
80 capURLS += "<key>EventQueueGet</key><string>http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + capsObjectPath + eventQueue + "</string>";
77 return capURLS; 81 return capURLS;
78 } 82 }
79 83
@@ -116,6 +120,40 @@ namespace OpenSim.Region
116 return res; 120 return res;
117 } 121 }
118 122
123 public string ProcessEventQueue(string request, string path, string param)
124 {
125 Console.WriteLine("event queue request " + request);
126 string res = "";
127 res = this.CreateEmptyEventResponse();
128 return res;
129 }
130
131 public string CreateEstablishAgentComms(string caps, string ipAddressPort)
132 {
133 string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
134 res += "<key>events</key><array><map>";
135 res += "<key>message</key><string>EstablishAgentCommunication</string>";
136 res += "<key>body</key><map>";
137 res += "<key>sim-ip-and-port</key><string>"+ipAddressPort +"</string>";
138 res += "<key>seed-capability</key><string>"+caps+"</string>";
139 res += "<key>agent-id</key><uuid>"+this.agentID.ToStringHyphenated()+"</uuid>";
140 res += "</map>";
141 res += "</map></array>";
142 res += "</map></llsd>";
143 eventQueueCount++;
144 return res;
145 }
146
147 public string CreateEmptyEventResponse()
148 {
149 string res = "<llsd><map><key>id</key><integer>" + eventQueueCount + "</integer>";
150 res += "<key>events</key><array><map>";
151 res += "</map></array>";
152 res += "</map></llsd>";
153 eventQueueCount++;
154 return res;
155 }
156
119 public string NewAgentInventory(string request, string path, string param) 157 public string NewAgentInventory(string request, string path, string param)
120 { 158 {
121 //Console.WriteLine("received upload request:"+ request); 159 //Console.WriteLine("received upload request:"+ request);
@@ -123,13 +161,13 @@ namespace OpenSim.Region
123 LLUUID newAsset = LLUUID.Random(); 161 LLUUID newAsset = LLUUID.Random();
124 LLUUID newInvItem = LLUUID.Random(); 162 LLUUID newInvItem = LLUUID.Random();
125 string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000"); 163 string uploaderPath = capsObjectPath + Util.RandomClass.Next(5000, 8000).ToString("0000");
126 AssetUploader uploader = new AssetUploader(newAsset,newInvItem, uploaderPath, this.httpListener); 164 AssetUploader uploader = new AssetUploader(newAsset, newInvItem, uploaderPath, this.httpListener);
127 httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps); 165 httpListener.AddRestHandler("POST", "/CAPS/" + uploaderPath, uploader.uploaderCaps);
128 string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath; 166 string uploaderURL = "http://" + httpListenerAddress + ":" + httpListenPort.ToString() + "/CAPS/" + uploaderPath;
129 Console.WriteLine("uploader url is " + uploaderURL); 167 Console.WriteLine("uploader url is " + uploaderURL);
130 res += "<llsd><map>"; 168 res += "<llsd><map>";
131 res += "<key>uploader</key><string>"+uploaderURL +"</string>"; 169 res += "<key>uploader</key><string>" + uploaderURL + "</string>";
132 //res += "<key>success</key><boolean>true</boolean>"; 170 //res += "<key>success</key><boolean>true</boolean>";
133 res += "<key>state</key><string>upload</string>"; 171 res += "<key>state</key><string>upload</string>";
134 res += "</map></llsd>"; 172 res += "</map></llsd>";
135 uploader.OnUpLoad += this.UploadHandler; 173 uploader.OnUpLoad += this.UploadHandler;
@@ -138,7 +176,7 @@ namespace OpenSim.Region
138 176
139 public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data) 177 public void UploadHandler(LLUUID assetID, LLUUID inventoryItem, byte[] data)
140 { 178 {
141 // Console.WriteLine("upload handler called"); 179 // Console.WriteLine("upload handler called");
142 AssetBase asset; 180 AssetBase asset;
143 asset = new AssetBase(); 181 asset = new AssetBase();
144 asset.FullID = assetID; 182 asset.FullID = assetID;
@@ -147,7 +185,7 @@ namespace OpenSim.Region
147 asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000"); 185 asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
148 asset.Data = data; 186 asset.Data = data;
149 this.assetCache.AddAsset(asset); 187 this.assetCache.AddAsset(asset);
150 188
151 } 189 }
152 190
153 public class AssetUploader 191 public class AssetUploader
@@ -181,12 +219,12 @@ namespace OpenSim.Region
181 res += "</map></llsd>"; 219 res += "</map></llsd>";
182 220
183 Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated()); 221 Console.WriteLine("asset " + newAssetID.ToStringHyphenated() + " , inventory item " + inv.ToStringHyphenated());
184 httpListener.RemoveRestHandler("POST", "/CAPS/"+uploaderPath); 222 httpListener.RemoveRestHandler("POST", "/CAPS/" + uploaderPath);
185 if (OnUpLoad != null) 223 if (OnUpLoad != null)
186 { 224 {
187 OnUpLoad(newAssetID, inv, data); 225 OnUpLoad(newAssetID, inv, data);
188 } 226 }
189 227
190 /*FileStream fs = File.Create("upload.jp2"); 228 /*FileStream fs = File.Create("upload.jp2");
191 BinaryWriter bw = new BinaryWriter(fs); 229 BinaryWriter bw = new BinaryWriter(fs);
192 bw.Write(data); 230 bw.Write(data);
diff --git a/OpenSim/OpenSim/OpenSim.csproj b/OpenSim/OpenSim/OpenSim.csproj
index a8cadc0..91eb474 100644
--- a/OpenSim/OpenSim/OpenSim.csproj
+++ b/OpenSim/OpenSim/OpenSim.csproj
@@ -1,4 +1,4 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup> 2 <PropertyGroup>
3 <ProjectType>Local</ProjectType> 3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion> 4 <ProductVersion>8.0.50727</ProductVersion>
@@ -6,7 +6,8 @@
6 <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{438A9556-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim</AssemblyName> 13 <AssemblyName>OpenSim</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Exe</OutputType> 18 <OutputType>Exe</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim</RootNamespace> 21 <RootNamespace>OpenSim</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,108 +61,113 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="Axiom.MathLib.dll" > 68 <Reference Include="Axiom.MathLib.dll">
62 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> 69 <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="Db4objects.Db4o.dll" > 72 <Reference Include="Db4objects.Db4o.dll">
66 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> 73 <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
67 <Private>False</Private> 74 <Private>False</Private>
68 </Reference> 75 </Reference>
69 <Reference Include="libsecondlife.dll" > 76 <Reference Include="libsecondlife.dll">
70 <HintPath>..\..\bin\libsecondlife.dll</HintPath> 77 <HintPath>..\..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private> 78 <Private>False</Private>
72 </Reference> 79 </Reference>
73 <Reference Include="System" > 80 <Reference Include="System">
74 <HintPath>System.dll</HintPath> 81 <HintPath>System.dll</HintPath>
75 <Private>False</Private> 82 <Private>False</Private>
76 </Reference> 83 </Reference>
77 <Reference Include="System.Xml" > 84 <Reference Include="System.Xml">
78 <HintPath>System.Xml.dll</HintPath> 85 <HintPath>System.Xml.dll</HintPath>
79 <Private>False</Private> 86 <Private>False</Private>
80 </Reference> 87 </Reference>
81 </ItemGroup> 88 </ItemGroup>
82 <ItemGroup> 89 <ItemGroup>
90 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications.OGS1\OpenGrid.Framework.Communications.OGS1.csproj">
91 <Project>{C1F40DD4-A68B-4233-9142-CE236775A3CE}</Project>
92 <Name>OpenGrid.Framework.Communications.OGS1</Name>
93 </ProjectReference>
83 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj"> 94 <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
84 <Name>OpenGrid.Framework.Communications</Name> 95 <Name>OpenGrid.Framework.Communications</Name>
85 <Project>{683344D5-0000-0000-0000-000000000000}</Project> 96 <Project>{683344D5-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 97 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private> 98 <Private>False</Private>
88 </ProjectReference> 99 </ProjectReference>
89 <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj"> 100 <ProjectReference Include="..\..\Common\OpenGrid.Framework.UserManager\OpenGrid.Framework.UserManagement.csproj">
90 <Name>OpenGrid.Framework.UserManagement</Name> 101 <Name>OpenGrid.Framework.UserManagement</Name>
91 <Project>{DA9A7391-0000-0000-0000-000000000000}</Project> 102 <Project>{DA9A7391-0000-0000-0000-000000000000}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 103 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private> 104 <Private>False</Private>
94 </ProjectReference> 105 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj"> 106 <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">
96 <Name>OpenSim.Caches</Name> 107 <Name>OpenSim.Caches</Name>
97 <Project>{1938EB12-0000-0000-0000-000000000000}</Project> 108 <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 109 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private> 110 <Private>False</Private>
100 </ProjectReference> 111 </ProjectReference>
101 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> 112 <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
102 <Name>OpenSim.Framework</Name> 113 <Name>OpenSim.Framework</Name>
103 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> 114 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 115 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private> 116 <Private>False</Private>
106 </ProjectReference> 117 </ProjectReference>
107 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> 118 <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
108 <Name>OpenSim.Framework.Console</Name> 119 <Name>OpenSim.Framework.Console</Name>
109 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> 120 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 121 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111 <Private>False</Private> 122 <Private>False</Private>
112 </ProjectReference> 123 </ProjectReference>
113 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> 124 <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
114 <Name>OpenSim.GenericConfig.Xml</Name> 125 <Name>OpenSim.GenericConfig.Xml</Name>
115 <Project>{E88EF749-0000-0000-0000-000000000000}</Project> 126 <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 127 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
117 <Private>False</Private> 128 <Private>False</Private>
118 </ProjectReference> 129 </ProjectReference>
119 <ProjectReference Include="..\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj"> 130 <ProjectReference Include="..\OpenSim.LocalCommunications\OpenSim.LocalCommunications.csproj">
120 <Name>OpenSim.LocalCommunications</Name> 131 <Name>OpenSim.LocalCommunications</Name>
121 <Project>{79CED992-0000-0000-0000-000000000000}</Project> 132 <Project>{79CED992-0000-0000-0000-000000000000}</Project>
122 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 133 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
123 <Private>False</Private> 134 <Private>False</Private>
124 </ProjectReference> 135 </ProjectReference>
125 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> 136 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
126 <Name>OpenSim.Physics.Manager</Name> 137 <Name>OpenSim.Physics.Manager</Name>
127 <Project>{8BE16150-0000-0000-0000-000000000000}</Project> 138 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
128 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 139 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
129 <Private>False</Private> 140 <Private>False</Private>
130 </ProjectReference> 141 </ProjectReference>
131 <ProjectReference Include="..\OpenSim.Region\OpenSim.Region.csproj"> 142 <ProjectReference Include="..\OpenSim.Region\OpenSim.Region.csproj">
132 <Name>OpenSim.Region</Name> 143 <Name>OpenSim.Region</Name>
133 <Project>{196916AF-0000-0000-0000-000000000000}</Project> 144 <Project>{196916AF-0000-0000-0000-000000000000}</Project>
134 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 145 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
135 <Private>False</Private> 146 <Private>False</Private>
136 </ProjectReference> 147 </ProjectReference>
137 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj"> 148 <ProjectReference Include="..\OpenSim.RegionServer\OpenSim.RegionServer.csproj">
138 <Name>OpenSim.RegionServer</Name> 149 <Name>OpenSim.RegionServer</Name>
139 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project> 150 <Project>{632E1BFD-0000-0000-0000-000000000000}</Project>
140 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 151 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
141 <Private>False</Private> 152 <Private>False</Private>
142 </ProjectReference> 153 </ProjectReference>
143 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> 154 <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
144 <Name>OpenSim.Servers</Name> 155 <Name>OpenSim.Servers</Name>
145 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> 156 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
146 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 157 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
147 <Private>False</Private> 158 <Private>False</Private>
148 </ProjectReference> 159 </ProjectReference>
149 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj"> 160 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
150 <Name>OpenSim.Terrain.BasicTerrain</Name> 161 <Name>OpenSim.Terrain.BasicTerrain</Name>
151 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> 162 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
152 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 163 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
153 <Private>False</Private> 164 <Private>False</Private>
154 </ProjectReference> 165 </ProjectReference>
155 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> 166 <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
156 <Name>XMLRPC</Name> 167 <Name>XMLRPC</Name>
157 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 168 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
158 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 169 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
159 <Private>False</Private> 170 <Private>False</Private>
160 </ProjectReference> 171 </ProjectReference>
161 </ItemGroup> 172 </ItemGroup>
162 <ItemGroup> 173 <ItemGroup>
@@ -174,4 +185,4 @@
174 <PostBuildEvent> 185 <PostBuildEvent>
175 </PostBuildEvent> 186 </PostBuildEvent>
176 </PropertyGroup> 187 </PropertyGroup>
177</Project> 188</Project> \ No newline at end of file
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index e2dddaf..50da5a1 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -54,6 +54,7 @@ using OpenSim.Servers;
54using OpenSim.GenericConfig; 54using OpenSim.GenericConfig;
55using OpenGrid.Framework.Communications; 55using OpenGrid.Framework.Communications;
56using OpenSim.LocalCommunications; 56using OpenSim.LocalCommunications;
57using OpenGrid.Framework.Communications.OGS1;
57 58
58namespace OpenSim 59namespace OpenSim
59{ 60{
@@ -114,7 +115,7 @@ namespace OpenSim
114 else 115 else
115 { 116 {
116 this.SetupRemoteGridServers(); 117 this.SetupRemoteGridServers();
117 this.commsManager = new CommunicationsLocal(this.serversData.DefaultHomeLocX, this.serversData.DefaultHomeLocY); //shouldn't be using the local communications manager 118 this.commsManager = new GridCommsManager();
118 } 119 }
119 120
120 startuptime = DateTime.Now; 121 startuptime = DateTime.Now;
@@ -267,7 +268,7 @@ namespace OpenSim
267 268
268 protected override void SetupHttpListener() 269 protected override void SetupHttpListener()
269 { 270 {
270 httpServer = new BaseHttpServer(9000); //regionData[0].IPListenPort); 271 httpServer = new BaseHttpServer(this.serversData.HttpListenerPort); //regionData[0].IPListenPort);
271 272
272 if (!this.m_sandbox) 273 if (!this.m_sandbox)
273 { 274 {