aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/CAPS/AdminWebFront.cs
diff options
context:
space:
mode:
authorlbsa712007-03-27 20:45:04 +0000
committerlbsa712007-03-27 20:45:04 +0000
commit7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8 (patch)
treed8dc563b7fef4ce9dcc34fbcc31c3fcc7d99d49f /OpenSim.RegionServer/CAPS/AdminWebFront.cs
parent* Config should be loaded before login server startup... (diff)
downloadopensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.zip
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.gz
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.bz2
opensim-SC_OLD-7adbe756fbb1d1c4cd71df90bd12d7e3da60bdf8.tar.xz
* Reverting todays work. It was worth a try.
Diffstat (limited to '')
-rw-r--r--OpenSim.RegionServer/CAPS/AdminWebFront.cs11
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index 03f8692..ea32589 100644
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
@@ -2,7 +2,6 @@ using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using System.IO; 4using System.IO;
5using OpenSim.world;
6 5
7namespace OpenSim.CAPS 6namespace OpenSim.CAPS
8{ 7{
@@ -12,11 +11,9 @@ namespace OpenSim.CAPS
12 private string NewAccountForm; 11 private string NewAccountForm;
13 private string LoginForm; 12 private string LoginForm;
14 private string passWord = "Admin"; 13 private string passWord = "Admin";
15 private World m_world;
16 14
17 public AdminWebFront(string password, World world) 15 public AdminWebFront(string password)
18 { 16 {
19 m_world = world;
20 passWord = password; 17 passWord = password;
21 LoadAdminPage(); 18 LoadAdminPage();
22 } 19 }
@@ -48,11 +45,11 @@ namespace OpenSim.CAPS
48 { 45 {
49 responseString = " <p> Listing connected Clients </p>"; 46 responseString = " <p> Listing connected Clients </p>";
50 OpenSim.world.Avatar TempAv; 47 OpenSim.world.Avatar TempAv;
51 foreach (libsecondlife.LLUUID UUID in m_world.Entities.Keys) 48 foreach (libsecondlife.LLUUID UUID in OpenSimRoot.Instance.LocalWorld.Entities.Keys)
52 { 49 {
53 if (m_world.Entities[UUID].ToString() == "OpenSim.world.Avatar") 50 if (OpenSimRoot.Instance.LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
54 { 51 {
55 TempAv = (OpenSim.world.Avatar)m_world.Entities[UUID]; 52 TempAv = (OpenSim.world.Avatar)OpenSimRoot.Instance.LocalWorld.Entities[UUID];
56 responseString += "<p>"; 53 responseString += "<p>";
57 responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()); 54 responseString += String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString());
58 responseString += "</p>"; 55 responseString += "</p>";