diff options
author | Justin Clark-Casey (justincc) | 2011-09-02 23:19:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-02 23:19:27 +0100 |
commit | e6eb0d9a6f2c0e792e3c1a77990fe18e153e454d (patch) | |
tree | 4d0f4ab33cb6e5ade8a6ac475f58d16e7e39ceaf /OpenSim/Region/Framework/Scenes | |
parent | Remove redundant RootPart.CreatedSelected = true in IAM.RezObject() since thi... (diff) | |
download | opensim-SC_OLD-e6eb0d9a6f2c0e792e3c1a77990fe18e153e454d.zip opensim-SC_OLD-e6eb0d9a6f2c0e792e3c1a77990fe18e153e454d.tar.gz opensim-SC_OLD-e6eb0d9a6f2c0e792e3c1a77990fe18e153e454d.tar.bz2 opensim-SC_OLD-e6eb0d9a6f2c0e792e3c1a77990fe18e153e454d.tar.xz |
Comment out Scene.CleanDroppedAttachments() and calls.
This method wasn't actually doing anything since dropped attachments retain a PCode of 9.
Also, behaviour of dropped attachments in other places appears to be that they persist after avatar logout rather than get deleted.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9794a34..d3de37d 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3182,7 +3182,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3182 | } | 3182 | } |
3183 | 3183 | ||
3184 | m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); | 3184 | m_authenticateHandler.RemoveCircuit(avatar.ControllingClient.CircuitCode); |
3185 | CleanDroppedAttachments(); | 3185 | // CleanDroppedAttachments(); |
3186 | //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); | 3186 | //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false)); |
3187 | //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); | 3187 | //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true)); |
3188 | } | 3188 | } |
@@ -3406,7 +3406,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3406 | 3406 | ||
3407 | if (vialogin) | 3407 | if (vialogin) |
3408 | { | 3408 | { |
3409 | CleanDroppedAttachments(); | 3409 | // CleanDroppedAttachments(); |
3410 | 3410 | ||
3411 | if (TestBorderCross(agent.startpos, Cardinals.E)) | 3411 | if (TestBorderCross(agent.startpos, Cardinals.E)) |
3412 | { | 3412 | { |
@@ -5123,40 +5123,40 @@ namespace OpenSim.Region.Framework.Scenes | |||
5123 | } | 5123 | } |
5124 | } | 5124 | } |
5125 | 5125 | ||
5126 | public void CleanDroppedAttachments() | 5126 | // public void CleanDroppedAttachments() |
5127 | { | 5127 | // { |
5128 | List<SceneObjectGroup> objectsToDelete = | 5128 | // List<SceneObjectGroup> objectsToDelete = |
5129 | new List<SceneObjectGroup>(); | 5129 | // new List<SceneObjectGroup>(); |
5130 | 5130 | // | |
5131 | lock (m_cleaningAttachments) | 5131 | // lock (m_cleaningAttachments) |
5132 | { | 5132 | // { |
5133 | ForEachSOG(delegate (SceneObjectGroup grp) | 5133 | // ForEachSOG(delegate (SceneObjectGroup grp) |
5134 | { | 5134 | // { |
5135 | if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp))) | 5135 | // if (grp.RootPart.Shape.PCode == 0 && grp.RootPart.Shape.State != 0 && (!objectsToDelete.Contains(grp))) |
5136 | { | 5136 | // { |
5137 | UUID agentID = grp.OwnerID; | 5137 | // UUID agentID = grp.OwnerID; |
5138 | if (agentID == UUID.Zero) | 5138 | // if (agentID == UUID.Zero) |
5139 | { | 5139 | // { |
5140 | objectsToDelete.Add(grp); | 5140 | // objectsToDelete.Add(grp); |
5141 | return; | 5141 | // return; |
5142 | } | 5142 | // } |
5143 | 5143 | // | |
5144 | ScenePresence sp = GetScenePresence(agentID); | 5144 | // ScenePresence sp = GetScenePresence(agentID); |
5145 | if (sp == null) | 5145 | // if (sp == null) |
5146 | { | 5146 | // { |
5147 | objectsToDelete.Add(grp); | 5147 | // objectsToDelete.Add(grp); |
5148 | return; | 5148 | // return; |
5149 | } | 5149 | // } |
5150 | } | 5150 | // } |
5151 | }); | 5151 | // }); |
5152 | } | 5152 | // } |
5153 | 5153 | // | |
5154 | foreach (SceneObjectGroup grp in objectsToDelete) | 5154 | // foreach (SceneObjectGroup grp in objectsToDelete) |
5155 | { | 5155 | // { |
5156 | m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID); | 5156 | // m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID); |
5157 | DeleteSceneObject(grp, true); | 5157 | // DeleteSceneObject(grp, true); |
5158 | } | 5158 | // } |
5159 | } | 5159 | // } |
5160 | 5160 | ||
5161 | // This method is called across the simulation connector to | 5161 | // This method is called across the simulation connector to |
5162 | // determine if a given agent is allowed in this region | 5162 | // determine if a given agent is allowed in this region |