diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Framework/AvatarAppearance.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC_OLD-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to 'OpenSim/Framework/AvatarAppearance.cs')
| -rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index 4f598b0..95e9667 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
| @@ -330,6 +330,9 @@ namespace OpenSim.Framework | |||
| 330 | SetVisualParams(visualParams); | 330 | SetVisualParams(visualParams); |
| 331 | } | 331 | } |
| 332 | 332 | ||
| 333 | /// <summary> | ||
| 334 | /// Set avatar height by a calculation based on their visual parameters. | ||
| 335 | /// </summary> | ||
| 333 | public virtual void SetHeight() | 336 | public virtual void SetHeight() |
| 334 | { | 337 | { |
| 335 | // Start with shortest possible female avatar height | 338 | // Start with shortest possible female avatar height |