OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Melanie Thielker 2010-08-14 14:00:12 +02:00
parent a32b0ce0ae 042eb80a62
commit f2d7f3e731
6 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
if (account != null) if (account != null)
m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromMinutes(2.0d)); m_NameCache.AddOrUpdate(account.Name, account.PrincipalID, DateTime.Now + TimeSpan.FromMinutes(2.0d));
m_log.DebugFormat("[USER CACHE]: cached user {0}", userID); // m_log.DebugFormat("[USER CACHE]: cached user {0}", userID);
} }
public UserAccount Get(UUID userID, out bool inCache) public UserAccount Get(UUID userID, out bool inCache)

11
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -3335,7 +3335,9 @@ namespace OpenSim.Region.Framework.Scenes
m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); m_sceneGridService.SendCloseChildAgentConnections(agentID, regions);
} }
m_log.Debug("[Scene] Beginning ClientClosed");
m_eventManager.TriggerClientClosed(agentID, this); m_eventManager.TriggerClientClosed(agentID, this);
m_log.Debug("[Scene] Finished ClientClosed");
} }
catch (NullReferenceException) catch (NullReferenceException)
{ {
@ -3343,7 +3345,9 @@ namespace OpenSim.Region.Framework.Scenes
// Avatar is already disposed :/ // Avatar is already disposed :/
} }
m_log.Debug("[Scene] Beginning OnRemovePresence");
m_eventManager.TriggerOnRemovePresence(agentID); m_eventManager.TriggerOnRemovePresence(agentID);
m_log.Debug("[Scene] Finished OnRemovePresence");
ForEachClient( ForEachClient(
delegate(IClientAPI client) delegate(IClientAPI client)
{ {
@ -3359,8 +3363,11 @@ namespace OpenSim.Region.Framework.Scenes
} }
// Remove the avatar from the scene // Remove the avatar from the scene
m_log.Debug("[Scene] Begin RemoveScenePresence");
m_sceneGraph.RemoveScenePresence(agentID); m_sceneGraph.RemoveScenePresence(agentID);
m_log.Debug("[Scene] Finished RemoveScenePresence. Removing the client manager");
m_clientManager.Remove(agentID); m_clientManager.Remove(agentID);
m_log.Debug("[Scene] Removed the client manager. Firing avatar.close");
try try
{ {
@ -3374,9 +3381,9 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_log.Error("[SCENE] Scene.cs:RemoveClient exception: " + e.ToString()); m_log.Error("[SCENE] Scene.cs:RemoveClient exception: " + e.ToString());
} }
m_log.Debug("[Scene] Done. Firing RemoveCircuit");
m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode);
m_log.Debug("[Scene] The avatar has left the building");
//m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
//m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
} }

2
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -1827,7 +1827,7 @@ namespace OpenSim.Region.Framework.Scenes
// which stops client-side interpolation of deactivated joint proxy objects. // which stops client-side interpolation of deactivated joint proxy objects.
} }
if (!UsePhysics) if (!UsePhysics && !isNew)
{ {
// reset velocity to 0 on physics switch-off. Without that, the client thinks the // reset velocity to 0 on physics switch-off. Without that, the client thinks the
// prim still has velocity and continues to interpolate its position along the old // prim still has velocity and continues to interpolate its position along the old

14
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -4200,10 +4200,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
m_host.AddScriptLPS(1); m_host.AddScriptLPS(1);
List<TaskInventoryItem> inv;
try try
{ {
m_host.TaskInventory.LockItemsForRead(true); m_host.TaskInventory.LockItemsForRead(true);
foreach (TaskInventoryItem item in m_host.TaskInventory.Values) inv = new List<TaskInventoryItem>(m_host.TaskInventory.Values);
}
finally
{
m_host.TaskInventory.LockItemsForRead(false);
}
foreach (TaskInventoryItem item in inv)
{ {
if (item.Name == name) if (item.Name == name)
{ {
@ -4215,11 +4222,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
} }
} }
} }
finally
{
m_host.TaskInventory.LockItemsForRead(false);
}
}
public void llSetText(string text, LSL_Vector color, double alpha) public void llSetText(string text, LSL_Vector color, double alpha)
{ {

2
OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs
View File

@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors
public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID) public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID)
{ {
m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccount {0}", userID); // m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccount {0}", userID);
Dictionary<string, object> sendData = new Dictionary<string, object>(); Dictionary<string, object> sendData = new Dictionary<string, object>();
//sendData["SCOPEID"] = scopeID.ToString(); //sendData["SCOPEID"] = scopeID.ToString();
sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();

4
bin/OpenSim.ini.example
View File

@ -1278,6 +1278,10 @@ UseSafetyCommit = true
; Enable media on a prim facilities ; Enable media on a prim facilities
Enabled = true; Enabled = true;
[MOTD]
Enabled = false
Message = "The MOTD module is working!"
;; ;;
;; These are defaults that are overwritten below in [Architecture]. ;; These are defaults that are overwritten below in [Architecture].