diff options
| author | Justin Clark-Casey (justincc) | 2012-03-09 23:57:24 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-03-09 23:57:24 +0000 |
| commit | bdc968f1fcd4008e9f2a6099a7d30edb075ca0f1 (patch) | |
| tree | 7c2c45cc97fb1b2181605313ed50e5db9cd6ec0f /OpenSim/Region/RegionCombinerModule | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-bdc968f1fcd4008e9f2a6099a7d30edb075ca0f1.zip opensim-SC-bdc968f1fcd4008e9f2a6099a7d30edb075ca0f1.tar.gz opensim-SC-bdc968f1fcd4008e9f2a6099a7d30edb075ca0f1.tar.bz2 opensim-SC-bdc968f1fcd4008e9f2a6099a7d30edb075ca0f1.tar.xz | |
Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.
As per opensim-users mailing list discussion.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs index eb633b3..a142f26 100644 --- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs +++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs | |||
| @@ -712,7 +712,7 @@ namespace OpenSim.Region.RegionCombinerModule | |||
| 712 | 712 | ||
| 713 | List<Vector3> CoarseLocations = new List<Vector3>(); | 713 | List<Vector3> CoarseLocations = new List<Vector3>(); |
| 714 | List<UUID> AvatarUUIDs = new List<UUID>(); | 714 | List<UUID> AvatarUUIDs = new List<UUID>(); |
| 715 | 715 | ||
| 716 | connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) | 716 | connectiondata.RegionScene.ForEachRootScenePresence(delegate(ScenePresence sp) |
| 717 | { | 717 | { |
| 718 | if (sp.UUID != presence.UUID) | 718 | if (sp.UUID != presence.UUID) |