diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:43:11 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-16 15:43:11 -0800 |
commit | 4dfed6e353ff880fcd45b4c8b402bf0f5a2f19f2 (patch) | |
tree | 5d620ae33a3f1914acf3996c8ba59d33ff2c49e1 /indra/llui/lldockcontrol.h | |
parent | fb384e6af40f6a0149d93cdc38d598dd95067fbb (diff) | |
parent | 0e234edcc67ecf534df15f088158ef236f6de102 (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llui/lldockcontrol.h')
-rw-r--r-- | indra/llui/lldockcontrol.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llui/lldockcontrol.h b/indra/llui/lldockcontrol.h index 550955c4c5..a5caf68001 100644 --- a/indra/llui/lldockcontrol.h +++ b/indra/llui/lldockcontrol.h @@ -47,8 +47,9 @@ class LLDockControl public: enum DocAt { - TOP - ,LEFT + TOP, + LEFT, + BOTTOM }; public: |