diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 23:50:59 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-11 23:50:59 +0000 |
| commit | 7df79382a075646a51f21bed0d7f8de883fc3608 (patch) | |
| tree | e7a71ed0dc7e05e4091066e3a0455343dfcfce4f /indra/newview/llfloatercamera.h | |
| parent | 56449313529145a3d3c0e231967d9502b549056c (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
* Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868
* New Development: EXT-748 EXT-863 EXT-835
QA: Please test Recent List to verify it has no troubles.
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 04554c6493..1181c443bf 100644 --- a/indra/newview/llfloatercamera.h +++ b/indra/newview/llfloatercamera.h @@ -62,9 +62,8 @@ public: static void toPrevModeIfInAvatarViewMode(); - /* resets free camera mode to the previous mode */ - //*TODO remove, if it won't be used by LLToolCamera::handleDeselect() - void resetFreeCameraMode(); + /** resets current camera mode to orbit mode */ + static void resetCameraMode(); /* determines actual mode and updates ui */ void update(); |