diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-10-19 13:04:54 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-10-19 13:04:54 -0400 |
| commit | 77876a3c4f18b480f9afd17be57b123d2e5f1e84 (patch) | |
| tree | 04b31f26cceef5cc411b166d30eb694707d995aa /indra/newview/llfloatercamera.h | |
| parent | e0f6e449594c44511d9634ea54faf54f8fe5cb7c (diff) | |
| parent | dd61baa3401a09bd8ff1e894514c15390946cdb3 (diff) | |
Merged with viewer-development.
Diffstat (limited to 'indra/newview/llfloatercamera.h')
| -rw-r--r-- | indra/newview/llfloatercamera.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloatercamera.h b/indra/newview/llfloatercamera.h index 424191ef26..4572932853 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -27,7 +27,7 @@ #ifndef LLFLOATERCAMERA_H #define LLFLOATERCAMERA_H -#include "lltransientdockablefloater.h" +#include "llfloater.h" #include "lliconctrl.h" #include "lltextbox.h" #include "llflatlistview.h" @@ -45,8 +45,7 @@ enum ECameraControlMode CAMERA_CTRL_MODE_PRESETS }; -class LLFloaterCamera - : public LLTransientDockableFloater +class LLFloaterCamera : public LLFloater { friend class LLFloaterReg; |