diff options
author | Justin Clark-Casey (justincc) | 2011-09-17 00:26:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-17 00:26:53 +0100 |
commit | 385c4a210deb63c25f082ab8a3f0c63c7bff8fb5 (patch) | |
tree | 404f2070fcb613ec19bb64d16d5a34de5cfa2dba /OpenSim/Region/CoreModules/Avatar/AvatarFactory | |
parent | Revert "uncomment Standalone config in OpenSim.ini.example." (diff) | |
download | opensim-SC_OLD-385c4a210deb63c25f082ab8a3f0c63c7bff8fb5.zip opensim-SC_OLD-385c4a210deb63c25f082ab8a3f0c63c7bff8fb5.tar.gz opensim-SC_OLD-385c4a210deb63c25f082ab8a3f0c63c7bff8fb5.tar.bz2 opensim-SC_OLD-385c4a210deb63c25f082ab8a3f0c63c7bff8fb5.tar.xz |
On setting a new avatar appearance, if height hasn't changed then don't set that same height in ScenePresence.
This prevents unnecessary work in the ODE module, though possibly that should be checking against same size sets itself
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index c5a1828..bb63bcd 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -211,8 +211,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
211 | // Process the visual params, this may change height as well | 211 | // Process the visual params, this may change height as well |
212 | if (visualParams != null) | 212 | if (visualParams != null) |
213 | { | 213 | { |
214 | float oldHeight = sp.Appearance.AvatarHeight; | ||
214 | changed = sp.Appearance.SetVisualParams(visualParams); | 215 | changed = sp.Appearance.SetVisualParams(visualParams); |
215 | if (sp.Appearance.AvatarHeight > 0) | 216 | |
217 | if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0) | ||
216 | sp.SetHeight(sp.Appearance.AvatarHeight); | 218 | sp.SetHeight(sp.Appearance.AvatarHeight); |
217 | } | 219 | } |
218 | 220 | ||