ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed nebadon's UserServer crash bug from yesterday.

Browse Source 
* Made Estate tools work for estate managers without needing to request admin status First
* Added code to make the Simulator version to be reported in the About box of the client
This commit is contained in:
Teravus Ovares
2008-02-09 07:53:01 +00:00
parent fc9bdb6c16
commit 07d0f558c4
5 changed files with 51 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@@ -427,6 +427,8 @@ namespace OpenSim.Framework.UserManagement
if (userProfile != null)
{
// This line needs to be in side the above if statement or the UserServer will crash on some logouts.
m_log.Info("[LOGOUT]: " + userProfile.username + " " + userProfile.surname + " from " + regionhandle + "(" + posx + "," + posy + "," + posz + ")");
userAgent = userProfile.currentAgent;
if (userAgent != null)
@@ -434,7 +436,10 @@ namespace OpenSim.Framework.UserManagement
userAgent.agentOnline = false;
userAgent.logoutTime = Util.UnixTimeSinceEpoch();
userAgent.sessionID = LLUUID.Zero;
userAgent.currentRegion = regionid;
if (regionid != null)
{
userAgent.currentRegion = regionid;
}
userAgent.currentHandle = regionhandle;
userAgent.currentPos = currentPos;
@@ -446,9 +451,10 @@ namespace OpenSim.Framework.UserManagement
}
else
{
m_log.Info("[LOGOUT]: didn't save logout position, currentAgent: " + userAgent.ToString() );
// If currentagent is null, we can't reference it here or the UserServer crashes!
m_log.Info("[LOGOUT]: didn't save logout position: " + userid.ToString());
}
m_log.Info("[LOGOUT]: " + userProfile.username + " " + userProfile.surname + " from " + regionhandle + "(" + posx + "," + posy + "," + posz + ")" );
}
else
{

2
OpenSim/Framework/IScene.cs
View File

@@ -52,6 +52,8 @@ namespace OpenSim.Framework
void Restart(int seconds);
bool OtherRegionUp(RegionInfo thisRegion);
string GetSimulatorVersion();
RegionInfo RegionInfo { get; }
uint NextLocalId { get; }