diff options
author | UbitUmarov | 2012-12-07 15:54:46 +0000 |
---|---|---|
committer | UbitUmarov | 2012-12-07 15:54:46 +0000 |
commit | d2499c4c314b290c42f454913305d97c6eec92d6 (patch) | |
tree | d341f578da7a09e2dfce9733b16b5516b3c1314f /OpenSim/Region/CoreModules/Avatar | |
parent | fix regression (diff) | |
download | opensim-SC-d2499c4c314b290c42f454913305d97c6eec92d6.zip opensim-SC-d2499c4c314b290c42f454913305d97c6eec92d6.tar.gz opensim-SC-d2499c4c314b290c42f454913305d97c6eec92d6.tar.bz2 opensim-SC-d2499c4c314b290c42f454913305d97c6eec92d6.tar.xz |
*TEST* Use new avatar size in ubitODE.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 8496005..d557a28 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -174,12 +174,21 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
174 | // m_log.DebugFormat( | 174 | // m_log.DebugFormat( |
175 | // "[AVFACTORY]: Setting visual params for {0} to {1}", | 175 | // "[AVFACTORY]: Setting visual params for {0} to {1}", |
176 | // client.Name, string.Join(", ", visualParamsStrings)); | 176 | // client.Name, string.Join(", ", visualParamsStrings)); |
177 | 177 | /* | |
178 | float oldHeight = sp.Appearance.AvatarHeight; | 178 | float oldHeight = sp.Appearance.AvatarHeight; |
179 | changed = sp.Appearance.SetVisualParams(visualParams); | 179 | changed = sp.Appearance.SetVisualParams(visualParams); |
180 | 180 | ||
181 | if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0) | 181 | if (sp.Appearance.AvatarHeight != oldHeight && sp.Appearance.AvatarHeight > 0) |
182 | ((ScenePresence)sp).SetHeight(sp.Appearance.AvatarHeight); | 182 | ((ScenePresence)sp).SetHeight(sp.Appearance.AvatarHeight); |
183 | */ | ||
184 | float oldoff = sp.Appearance.AvatarFeetOffset; | ||
185 | Vector3 oldbox = sp.Appearance.AvatarBoxSize; | ||
186 | changed = sp.Appearance.SetVisualParams(visualParams); | ||
187 | float off = sp.Appearance.AvatarFeetOffset; | ||
188 | Vector3 box = sp.Appearance.AvatarBoxSize; | ||
189 | if(oldoff != off || oldbox != box) | ||
190 | ((ScenePresence)sp).SetSize(box,off); | ||
191 | |||
183 | } | 192 | } |
184 | 193 | ||
185 | // Process the baked texture array | 194 | // Process the baked texture array |