diff options
author | Justin Clark-Casey (justincc) | 2011-08-22 23:59:48 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-22 23:59:48 +0100 |
commit | d328046efbcd7449e0421f72138f48272f514481 (patch) | |
tree | 57534b6ccf769e89a886f8b77d49c4d8e79e27d1 /OpenSim/Region/Framework | |
parent | Add warning log message to say which attachment fails validation in order to ... (diff) | |
download | opensim-SC_OLD-d328046efbcd7449e0421f72138f48272f514481.zip opensim-SC_OLD-d328046efbcd7449e0421f72138f48272f514481.tar.gz opensim-SC_OLD-d328046efbcd7449e0421f72138f48272f514481.tar.bz2 opensim-SC_OLD-d328046efbcd7449e0421f72138f48272f514481.tar.xz |
If an attachment fails, then start logging the exception for now, in order to help with the inconsistent state bug.
This also refactors AttachmentsModules to stop pointlessly refetching the ScenePresence in various methods. However, more of this is required.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 4cb3df2..e012885 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -49,11 +49,9 @@ namespace OpenSim.Region.Framework.Interfaces | |||
49 | /// <summary> | 49 | /// <summary> |
50 | /// Attach an object to an avatar. | 50 | /// Attach an object to an avatar. |
51 | /// </summary> | 51 | /// </summary> |
52 | /// <param name="controllingClient"></param> | 52 | /// <param name="remoteClient"></param> |
53 | /// <param name="localID"></param> | 53 | /// <param name="grp"></param> |
54 | /// <param name="attachPoint"></param> | 54 | /// <param name="AttachmentPt"></param> |
55 | /// <param name="rot"></param> | ||
56 | /// <param name="attachPos"></param> | ||
57 | /// <param name="silent"></param> | 55 | /// <param name="silent"></param> |
58 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 56 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
59 | bool AttachObject( | 57 | bool AttachObject( |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 53c3b85..9f9af45 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3540,7 +3540,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3540 | } | 3540 | } |
3541 | } | 3541 | } |
3542 | } | 3542 | } |
3543 | 3543 | ||
3544 | return true; | 3544 | return true; |
3545 | } | 3545 | } |
3546 | 3546 | ||