aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2011-01-18 06:18:10 +0000
committerMelanie2011-01-18 06:18:10 +0000
commitf3968c49590cc1ace2a94ecc8e1fa9423d65844c (patch)
treeeb55ff50708e087424094e7a9f88af1f7858bbfa /OpenSim/Region
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentFix build break (diff)
downloadopensim-SC_OLD-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.zip
opensim-SC_OLD-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.gz
opensim-SC_OLD-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.bz2
opensim-SC_OLD-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 914990c..7df2beb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
85 item = invService.GetItem(item); 85 item = invService.GetItem(item);
86 if (item != null) 86 if (item != null)
87 { 87 {
88 item.Flags &= ~1; 88 item.Flags &= ~(uint)1;
89 invService.UpdateItem(item); 89 invService.UpdateItem(item);
90 } 90 }
91 else 91 else