diff options
| author | Diva Canto | 2011-12-21 15:17:44 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-12-21 15:17:44 -0800 |
| commit | bb0c6a498bfbd5fe42b287e5b79b15a887b88600 (patch) | |
| tree | cc97171a5264a64dad3ece91e0f090ea4cf45d9d /OpenSim/Region/Framework/Scenes | |
| parent | Moved an external test into the method that uses those preconditions. (diff) | |
| parent | Remove unused SetAcceleration and add set on Acceleration parameter (diff) | |
| download | opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.zip opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.gz opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.bz2 opensim-SC_OLD-bb0c6a498bfbd5fe42b287e5b79b15a887b88600.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 526fab3..6f02475 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2530,10 +2530,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2530 | // again here... this comes after the cached appearance check because the avatars | 2530 | // again here... this comes after the cached appearance check because the avatars |
| 2531 | // appearance goes into the avatar update packet | 2531 | // appearance goes into the avatar update packet |
| 2532 | SendAvatarDataToAllAgents(); | 2532 | SendAvatarDataToAllAgents(); |
| 2533 | 2533 | SendAppearanceToAgent(this); | |
| 2534 | // Sending us our own appearance does not seem to be necessary, and the viewer warns in the log if you do | ||
| 2535 | // this. | ||
| 2536 | // SendAppearanceToAgent(this); | ||
| 2537 | 2534 | ||
| 2538 | // If we are using the the cached appearance then send it out to everyone | 2535 | // If we are using the the cached appearance then send it out to everyone |
| 2539 | if (cachedappearance) | 2536 | if (cachedappearance) |