diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-11 15:16:45 -0700 |
| commit | 682609d254fb973cfa267923b69c5e06b7efd7e1 (patch) | |
| tree | 0063e23841b6e3bb588355ad428608bb1f4fcdf9 /indra/newview/llfloatercamera.h | |
| parent | 3596c0f7e139724f31258ffb96157146aeba77b1 (diff) | |
| parent | c1a9ca33b27f4e741eeacf781a09156009167ad3 (diff) | |
Pull from richard/viewer-experience-fui
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; |