diff options
author | Tom | 2011-09-14 19:31:55 -0700 |
---|---|---|
committer | Tom | 2011-09-14 19:31:55 -0700 |
commit | 1129b8062985f0252bea26c5e67b957a41cb457d (patch) | |
tree | dc721ac020e8040ea475b6211a953f6b04ffede5 /OpenSim/Region/CoreModules/Avatar | |
parent | Bring us up to date. (diff) | |
download | opensim-SC-1129b8062985f0252bea26c5e67b957a41cb457d.zip opensim-SC-1129b8062985f0252bea26c5e67b957a41cb457d.tar.gz opensim-SC-1129b8062985f0252bea26c5e67b957a41cb457d.tar.bz2 opensim-SC-1129b8062985f0252bea26c5e67b957a41cb457d.tar.xz |
Fix a rather stupid VS warning "The operation overflows at compile time in checked mode" - doesn't make much sense to me, but for some reason it doesn't like 256 - 6 when 256 is a constant...
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 2bf418d..a130ed2 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -834,14 +834,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
834 | // m_log.DebugFormat( | 834 | // m_log.DebugFormat( |
835 | // "[ATTACHMENTS MODULE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2}", | 835 | // "[ATTACHMENTS MODULE]: Called AddSceneObjectAsAttachment for object {0} {1} for {2}", |
836 | // grp.Name, grp.LocalId, remoteClient.Name); | 836 | // grp.Name, grp.LocalId, remoteClient.Name); |
837 | 837 | uint regionSize = Constants.RegionSize; //Avoid VS error "The operation overflows at compile time in checked mode" | |
838 | Vector3 inventoryStoredPosition = new Vector3 | 838 | Vector3 inventoryStoredPosition = new Vector3 |
839 | (((grp.AbsolutePosition.X > (int)Constants.RegionSize) | 839 | (((grp.AbsolutePosition.X > (int)Constants.RegionSize) |
840 | ? Constants.RegionSize - 6 | 840 | ? regionSize - 6 |
841 | : grp.AbsolutePosition.X) | 841 | : grp.AbsolutePosition.X) |
842 | , | 842 | , |
843 | (grp.AbsolutePosition.Y > (int)Constants.RegionSize) | 843 | (grp.AbsolutePosition.Y > (int)Constants.RegionSize) |
844 | ? Constants.RegionSize - 6 | 844 | ? regionSize - 6 |
845 | : grp.AbsolutePosition.Y, | 845 | : grp.AbsolutePosition.Y, |
846 | grp.AbsolutePosition.Z); | 846 | grp.AbsolutePosition.Z); |
847 | 847 | ||