aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/Framework.Manager
diff options
context:
space:
mode:
authormingchen2007-06-27 18:04:07 +0000
committermingchen2007-06-27 18:04:07 +0000
commit2261e4ec2a43a56dbb74168a169f39b2c6c1f054 (patch)
tree41c46ae07beb837ac109228a0a3731a10b422296 /OpenSim/Grid/Framework.Manager
parent*More compile fixes (should be it on OpenSim.sln) (diff)
downloadopensim-SC-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.zip
opensim-SC-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.gz
opensim-SC-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.bz2
opensim-SC-2261e4ec2a43a56dbb74168a169f39b2c6c1f054.tar.xz
*Fixed all renaming for OpenGridServices.sln, still a reference issue in prebuild.xml though
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/Framework.Manager/GridManagementAgent.cs6
-rw-r--r--OpenSim/Grid/Framework.Manager/GridServerManager.cs2
-rw-r--r--OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj4
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
index dfc572a..3f5d7dd 100644
--- a/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
+++ b/OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
@@ -27,12 +27,12 @@
27*/ 27*/
28using Nwc.XmlRpc; 28using Nwc.XmlRpc;
29using OpenSim.Framework; 29using OpenSim.Framework;
30using OpenSim.Servers; 30using OpenSim.Framework.Servers;
31using System.Collections; 31using System.Collections;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using libsecondlife; 33using libsecondlife;
34 34
35namespace OpenGrid.Framework.Manager 35namespace OpenSim.Framework.Manager
36{ 36{
37 /// <summary> 37 /// <summary>
38 /// Used to pass messages to the gridserver 38 /// Used to pass messages to the gridserver
@@ -116,7 +116,7 @@ namespace OpenGrid.Framework.Manager
116 Hashtable requestData = (Hashtable)request.Params[0]; 116 Hashtable requestData = (Hashtable)request.Params[0];
117 Hashtable responseData = new Hashtable(); 117 Hashtable responseData = new Hashtable();
118 118
119 // TODO: Switch this over to using OpenGrid.Framework.Data 119 // TODO: Switch this over to using OpenSim.Framework.Data
120 if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret")) 120 if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
121 { 121 {
122 response.IsFault = false; 122 response.IsFault = false;
diff --git a/OpenSim/Grid/Framework.Manager/GridServerManager.cs b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
index e276556..d5eaf6f 100644
--- a/OpenSim/Grid/Framework.Manager/GridServerManager.cs
+++ b/OpenSim/Grid/Framework.Manager/GridServerManager.cs
@@ -33,7 +33,7 @@ using Nwc.XmlRpc;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using libsecondlife;
35 35
36namespace OpenGrid.Framework.Manager { 36namespace OpenSim.Framework.Manager {
37 37
38 /// <summary> 38 /// <summary>
39 /// A remote management system for the grid server 39 /// A remote management system for the grid server
diff --git a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
index 9a98ff4..12edcd0 100644
--- a/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
+++ b/OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
@@ -82,10 +82,10 @@
82 <ItemGroup> 82 <ItemGroup>
83 </ItemGroup> 83 </ItemGroup>
84 <ItemGroup> 84 <ItemGroup>
85 <Compile Include="GridManagementAgent.cs"> 85 <Compile Include="GridServerManager.cs">
86 <SubType>Code</SubType> 86 <SubType>Code</SubType>
87 </Compile> 87 </Compile>
88 <Compile Include="GridServerManager.cs"> 88 <Compile Include="GridManagementAgent.cs">
89 <SubType>Code</SubType> 89 <SubType>Code</SubType>
90 </Compile> 90 </Compile>
91 </ItemGroup> 91 </ItemGroup>