diff options
| author | Melanie | 2012-03-22 20:38:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:38:49 +0000 |
| commit | 33818994810130117bae62ba2123bf8b55f181ea (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /OpenSim/Region/ScriptEngine | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| parent | Rework Diva's patch to simplify it (diff) | |
| download | opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.zip opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.gz opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2 opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index df4c7f8..bd4c5fc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4764,7 +4764,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4764 | 4764 | ||
| 4765 | if (m_host.RegionHandle == presence.RegionHandle) | 4765 | if (m_host.RegionHandle == presence.RegionHandle) |
| 4766 | { | 4766 | { |
| 4767 | Dictionary<UUID, string> animationstateNames = AnimationSet.Animations.AnimStateNames; | 4767 | Dictionary<UUID, string> animationstateNames = DefaultAvatarAnimations.AnimStateNames; |
| 4768 | 4768 | ||
| 4769 | if (presence != null) | 4769 | if (presence != null) |
| 4770 | { | 4770 | { |
| @@ -6064,7 +6064,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 6064 | } | 6064 | } |
| 6065 | 6065 | ||
| 6066 | if (agent.Animator.Animations.DefaultAnimation.AnimID | 6066 | if (agent.Animator.Animations.DefaultAnimation.AnimID |
| 6067 | == AnimationSet.Animations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) | 6067 | == DefaultAvatarAnimations.AnimsUUID["SIT_GROUND_CONSTRAINED"]) |
| 6068 | { | 6068 | { |
| 6069 | flags |= ScriptBaseClass.AGENT_SITTING; | 6069 | flags |= ScriptBaseClass.AGENT_SITTING; |
| 6070 | } | 6070 | } |