diff options
| author | Melanie | 2011-01-17 21:22:32 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-18 01:26:37 +0000 |
| commit | 31144a62b34cf84cbc2c5508924294334fb76979 (patch) | |
| tree | 9af0a8018ab42ef38de445664099767f7d75fd26 | |
| parent | Fix slam bits being lost when editing perms in prim inventory (diff) | |
| download | opensim-SC_OLD-31144a62b34cf84cbc2c5508924294334fb76979.zip opensim-SC_OLD-31144a62b34cf84cbc2c5508924294334fb76979.tar.gz opensim-SC_OLD-31144a62b34cf84cbc2c5508924294334fb76979.tar.bz2 opensim-SC_OLD-31144a62b34cf84cbc2c5508924294334fb76979.tar.xz | |
Change gesture activation to not quash any other flags
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs index 7303fe7..914990c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs | |||
| @@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures | |||
| 69 | item = invService.GetItem(item); | 69 | item = invService.GetItem(item); |
| 70 | if (item != null) | 70 | if (item != null) |
| 71 | { | 71 | { |
| 72 | item.Flags = 1; | 72 | item.Flags |= 1; |
| 73 | invService.UpdateItem(item); | 73 | invService.UpdateItem(item); |
| 74 | } | 74 | } |
| 75 | else | 75 | else |
| @@ -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 = 0; | 88 | item.Flags &= ~1; |
| 89 | invService.UpdateItem(item); | 89 | invService.UpdateItem(item); |
| 90 | } | 90 | } |
| 91 | else | 91 | else |
| @@ -93,4 +93,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures | |||
| 93 | "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name); | 93 | "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name); |
| 94 | } | 94 | } |
| 95 | } | 95 | } |
| 96 | } \ No newline at end of file | 96 | } |