diff options
author | MW | 2007-05-20 15:50:36 +0000 |
---|---|---|
committer | MW | 2007-05-20 15:50:36 +0000 |
commit | 4f26cf8ea220427f65d3b2adbf4b76f540469373 (patch) | |
tree | 1dc87689d586d1e2ff8026ac6a96a3b67c31b4d4 | |
parent | * Fixed depreciated warning in MSSQL Manager (diff) | |
download | opensim-SC-4f26cf8ea220427f65d3b2adbf4b76f540469373.zip opensim-SC-4f26cf8ea220427f65d3b2adbf4b76f540469373.tar.gz opensim-SC-4f26cf8ea220427f65d3b2adbf4b76f540469373.tar.bz2 opensim-SC-4f26cf8ea220427f65d3b2adbf4b76f540469373.tar.xz |
Didn't want to get left behind in the number of commits, and hey it says there are some differences between my local copy and svn, so why not commit?
Diffstat (limited to '')
-rw-r--r-- | OpenSim.Framework/UserProfile.cs | 1 | ||||
-rw-r--r-- | OpenSim.RegionServer/AuthenticateSessionsBase.cs | 4 | ||||
-rw-r--r-- | OpenSim.RegionServer/SimClient.cs | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim.Framework/UserProfile.cs b/OpenSim.Framework/UserProfile.cs index 0f21fb3..f95a8fa 100644 --- a/OpenSim.Framework/UserProfile.cs +++ b/OpenSim.Framework/UserProfile.cs | |||
@@ -49,6 +49,7 @@ namespace OpenSim.Framework.User | |||
49 | 49 | ||
50 | CurrentSecureSessionID = new LLUUID(randDataSS,0); | 50 | CurrentSecureSessionID = new LLUUID(randDataSS,0); |
51 | CurrentSessionID = new LLUUID(randDataS,0); | 51 | CurrentSessionID = new LLUUID(randDataS,0); |
52 | |||
52 | } | 53 | } |
53 | 54 | ||
54 | public void AddSimCircuit(uint circuitCode, LLUUID regionUUID) | 55 | public void AddSimCircuit(uint circuitCode, LLUUID regionUUID) |
diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim.RegionServer/AuthenticateSessionsBase.cs index 91bc54d..99b86d4 100644 --- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs +++ b/OpenSim.RegionServer/AuthenticateSessionsBase.cs | |||
@@ -82,9 +82,7 @@ namespace OpenSim | |||
82 | this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname; | 82 | this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname; |
83 | this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos; | 83 | this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos; |
84 | // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z); | 84 | // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z); |
85 | |||
86 | } | 85 | } |
87 | |||
88 | } | 86 | } |
89 | 87 | ||
90 | public void UpdateAgentChildStatus(uint circuitcode, bool childstatus) | 88 | public void UpdateAgentChildStatus(uint circuitcode, bool childstatus) |
@@ -92,7 +90,6 @@ namespace OpenSim | |||
92 | if (this.AgentCircuits.ContainsKey(circuitcode)) | 90 | if (this.AgentCircuits.ContainsKey(circuitcode)) |
93 | { | 91 | { |
94 | this.AgentCircuits[circuitcode].child = childstatus; | 92 | this.AgentCircuits[circuitcode].child = childstatus; |
95 | |||
96 | } | 93 | } |
97 | } | 94 | } |
98 | 95 | ||
@@ -101,7 +98,6 @@ namespace OpenSim | |||
101 | if (this.AgentCircuits.ContainsKey(circuitcode)) | 98 | if (this.AgentCircuits.ContainsKey(circuitcode)) |
102 | { | 99 | { |
103 | return this.AgentCircuits[circuitcode].child; | 100 | return this.AgentCircuits[circuitcode].child; |
104 | |||
105 | } | 101 | } |
106 | return false; | 102 | return false; |
107 | } | 103 | } |
diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 9ae08f4..3b243cf 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs | |||
@@ -144,7 +144,6 @@ namespace OpenSim | |||
144 | # region Client Methods | 144 | # region Client Methods |
145 | public void UpgradeClient() | 145 | public void UpgradeClient() |
146 | { | 146 | { |
147 | Console.WriteLine("updateclient being called"); | ||
148 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent"); | 147 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent"); |
149 | this.m_child = false; | 148 | this.m_child = false; |
150 | this.m_world.RemoveViewerAgent(this); | 149 | this.m_world.RemoveViewerAgent(this); |