diff options
| author | Melanie | 2012-10-26 21:13:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-26 21:13:01 +0100 |
| commit | 26cc57b6cafda5168baab49cabe34d96f01dbd6d (patch) | |
| tree | 94e078a75ab68825e64b15498f67d82988858dc9 /OpenSim/Framework/AvatarAppearance.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Make the error thrown logged when a simulator in grid mode is trying t... (diff) | |
| download | opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.zip opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.gz opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.bz2 opensim-SC_OLD-26cc57b6cafda5168baab49cabe34d96f01dbd6d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.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 c5d9641..1638541 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
| @@ -358,6 +358,9 @@ namespace OpenSim.Framework | |||
| 358 | SetVisualParams(visualParams); | 358 | SetVisualParams(visualParams); |
| 359 | } | 359 | } |
| 360 | 360 | ||
| 361 | /// <summary> | ||
| 362 | /// Set avatar height by a calculation based on their visual parameters. | ||
| 363 | /// </summary> | ||
| 361 | public virtual void SetHeight() | 364 | public virtual void SetHeight() |
| 362 | { | 365 | { |
| 363 | // Start with shortest possible female avatar height | 366 | // Start with shortest possible female avatar height |