aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OGS/gridserver/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OGS/gridserver/src/ConsoleCmds.cs (renamed from ogs/gridserver/src/ConsoleCmds.cs)0
-rw-r--r--OGS/gridserver/src/GridHttp.cs (renamed from ogs/gridserver/src/GridHttp.cs)3
-rw-r--r--OGS/gridserver/src/Main.cs (renamed from ogs/gridserver/src/Main.cs)0
-rw-r--r--OGS/gridserver/src/OGS-GridServer.csproj (renamed from ogs/gridserver/src/OGS-GridServer.csproj)14
-rw-r--r--OGS/gridserver/src/Properties/AssemblyInfo.cs (renamed from ogs/gridserver/src/Properties/AssemblyInfo.cs)0
-rw-r--r--OGS/gridserver/src/SimProfiles.cs (renamed from ogs/gridserver/src/SimProfiles.cs)21
6 files changed, 18 insertions, 20 deletions
diff --git a/ogs/gridserver/src/ConsoleCmds.cs b/OGS/gridserver/src/ConsoleCmds.cs
index 82a2279..82a2279 100644
--- a/ogs/gridserver/src/ConsoleCmds.cs
+++ b/OGS/gridserver/src/ConsoleCmds.cs
diff --git a/ogs/gridserver/src/GridHttp.cs b/OGS/gridserver/src/GridHttp.cs
index 833a8ac..496a3bc 100644
--- a/ogs/gridserver/src/GridHttp.cs
+++ b/OGS/gridserver/src/GridHttp.cs
@@ -38,6 +38,7 @@ using System.Collections;
38using System.Collections.Generic; 38using System.Collections.Generic;
39using libsecondlife; 39using libsecondlife;
40using ServerConsole; 40using ServerConsole;
41using OpenSim.Framework.Sims;
41 42
42namespace OpenGridServices 43namespace OpenGridServices
43{ 44{
@@ -73,7 +74,7 @@ namespace OpenGridServices
73 switch(request.MethodName) { 74 switch(request.MethodName) {
74 case "get_sim_info": 75 case "get_sim_info":
75 ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]); 76 ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]);
76 SimProfile TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle); 77 SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);
77 string RecvKey=""; 78 string RecvKey="";
78 string caller=(string)requestData["caller"]; 79 string caller=(string)requestData["caller"];
79 switch(caller) { 80 switch(caller) {
diff --git a/ogs/gridserver/src/Main.cs b/OGS/gridserver/src/Main.cs
index d29a1ae..d29a1ae 100644
--- a/ogs/gridserver/src/Main.cs
+++ b/OGS/gridserver/src/Main.cs
diff --git a/ogs/gridserver/src/OGS-GridServer.csproj b/OGS/gridserver/src/OGS-GridServer.csproj
index d984e9a..b957d40 100644
--- a/ogs/gridserver/src/OGS-GridServer.csproj
+++ b/OGS/gridserver/src/OGS-GridServer.csproj
@@ -40,9 +40,6 @@
40 <Compile Include="..\..\common\src\OGS-Console.cs"> 40 <Compile Include="..\..\common\src\OGS-Console.cs">
41 <Link>OGS-Console.cs</Link> 41 <Link>OGS-Console.cs</Link>
42 </Compile> 42 </Compile>
43 <Compile Include="..\..\common\src\Util.cs">
44 <Link>Util.cs</Link>
45 </Compile>
46 <Compile Include="..\..\common\VersionInfo\VersionInfo.cs"> 43 <Compile Include="..\..\common\VersionInfo\VersionInfo.cs">
47 <Link>VersionInfo.cs</Link> 44 <Link>VersionInfo.cs</Link>
48 </Compile> 45 </Compile>
@@ -53,17 +50,14 @@
53 <Compile Include="SimProfiles.cs" /> 50 <Compile Include="SimProfiles.cs" />
54 </ItemGroup> 51 </ItemGroup>
55 <ItemGroup> 52 <ItemGroup>
53 <ProjectReference Include="..\..\..\OpenSim.FrameWork\OpenSim.Framework.csproj">
54 <Project>{2E46A825-3168-492F-93BC-637126B5B72B}</Project>
55 <Name>OpenSim.Framework</Name>
56 </ProjectReference>
56 <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj"> 57 <ProjectReference Include="..\..\ServerConsole\ServerConsole.csproj">
57 <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project> 58 <Project>{7667E6E2-F227-41A2-B1B2-315613E1BAFC}</Project>
58 <Name>ServerConsole</Name> 59 <Name>ServerConsole</Name>
59 </ProjectReference> 60 </ProjectReference>
60 </ItemGroup> 61 </ItemGroup>
61 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> 62 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
62 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
63 Other similar extension points exist, see Microsoft.Common.targets.
64 <Target Name="BeforeBuild">
65 </Target>
66 <Target Name="AfterBuild">
67 </Target>
68 -->
69</Project> \ No newline at end of file 63</Project> \ No newline at end of file
diff --git a/ogs/gridserver/src/Properties/AssemblyInfo.cs b/OGS/gridserver/src/Properties/AssemblyInfo.cs
index 8471e6b..8471e6b 100644
--- a/ogs/gridserver/src/Properties/AssemblyInfo.cs
+++ b/OGS/gridserver/src/Properties/AssemblyInfo.cs
diff --git a/ogs/gridserver/src/SimProfiles.cs b/OGS/gridserver/src/SimProfiles.cs
index 91a92ea..6db8331 100644
--- a/ogs/gridserver/src/SimProfiles.cs
+++ b/OGS/gridserver/src/SimProfiles.cs
@@ -33,6 +33,8 @@ using System.Collections;
33using System.Collections.Generic; 33using System.Collections.Generic;
34using libsecondlife; 34using libsecondlife;
35using ServerConsole; 35using ServerConsole;
36using OpenSim.Framework.Utilities;
37using OpenSim.Framework.Sims;
36 38
37namespace OpenGridServices 39namespace OpenGridServices
38{ 40{
@@ -40,7 +42,7 @@ namespace OpenGridServices
40 /// </summary> 42 /// </summary>
41 public class SimProfileManager { 43 public class SimProfileManager {
42 44
43 public Dictionary<LLUUID, SimProfile> SimProfiles = new Dictionary<LLUUID, SimProfile>(); 45 public Dictionary<LLUUID, SimProfileBase> SimProfiles = new Dictionary<LLUUID, SimProfileBase>();
44 46
45 public SimProfileManager() { 47 public SimProfileManager() {
46 } 48 }
@@ -49,19 +51,19 @@ namespace OpenGridServices
49 // TODO: need to load from database 51 // TODO: need to load from database
50 } 52 }
51 53
52 public SimProfile GetProfileByHandle(ulong reqhandle) { 54 public SimProfileBase GetProfileByHandle(ulong reqhandle) {
53 foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) { 55 foreach (libsecondlife.LLUUID UUID in SimProfiles.Keys) {
54 if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID]; 56 if(SimProfiles[UUID].regionhandle==reqhandle) return SimProfiles[UUID];
55 } 57 }
56 return null; 58 return null;
57 } 59 }
58 60
59 public SimProfile GetProfileByLLUUID(LLUUID ProfileLLUUID) { 61 public SimProfileBase GetProfileByLLUUID(LLUUID ProfileLLUUID) {
60 return SimProfiles[ProfileLLUUID]; 62 return SimProfiles[ProfileLLUUID];
61 } 63 }
62 64
63 public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) { 65 public bool AuthenticateSim(LLUUID RegionUUID, uint regionhandle, string simrecvkey) {
64 SimProfile TheSim=GetProfileByHandle(regionhandle); 66 SimProfileBase TheSim=GetProfileByHandle(regionhandle);
65 if(TheSim != null) 67 if(TheSim != null)
66 if(TheSim.recvkey==simrecvkey) { 68 if(TheSim.recvkey==simrecvkey) {
67 return true; 69 return true;
@@ -71,8 +73,8 @@ namespace OpenGridServices
71 73
72 } 74 }
73 75
74 public SimProfile CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) { 76 public SimProfileBase CreateNewProfile(string regionname, string caps_url, string sim_ip, uint sim_port, uint RegionLocX, uint RegionLocY, string sendkey, string recvkey) {
75 SimProfile newprofile = new SimProfile(); 77 SimProfileBase newprofile = new SimProfileBase();
76 newprofile.regionname=regionname; 78 newprofile.regionname=regionname;
77 newprofile.sim_ip=sim_ip; 79 newprofile.sim_ip=sim_ip;
78 newprofile.sim_port=sim_port; 80 newprofile.sim_port=sim_port;
@@ -89,7 +91,8 @@ namespace OpenGridServices
89 91
90 } 92 }
91 93
92 public class SimProfile { 94 /* is in OpenSim.Framework
95 public class SimProfileBase {
93 public LLUUID UUID; 96 public LLUUID UUID;
94 public ulong regionhandle; 97 public ulong regionhandle;
95 public string regionname; 98 public string regionname;
@@ -102,10 +105,10 @@ namespace OpenGridServices
102 public string recvkey; 105 public string recvkey;
103 106
104 107
105 public SimProfile() { 108 public SimProfileBase() {
106 } 109 }
107 110
108 111
109 } 112 }*/
110 113
111} 114}