aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llcameraview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llcameraview.cpp
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/llcameraview.cpp')
-rw-r--r--linden/indra/newview/llcameraview.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/linden/indra/newview/llcameraview.cpp b/linden/indra/newview/llcameraview.cpp
index c510823..6c63359 100644
--- a/linden/indra/newview/llcameraview.cpp
+++ b/linden/indra/newview/llcameraview.cpp
@@ -124,17 +124,11 @@ void LLFloaterCamera::onClose(bool app_quitting)
124// static 124// static
125void LLFloaterCamera::show(void*) 125void LLFloaterCamera::show(void*)
126{ 126{
127 if (gFloaterCamera) 127 if(!gFloaterCamera)
128 {
129 gFloaterCamera->open();
130 }
131 else
132 { 128 {
133 gFloaterCamera = new LLFloaterCamera("camera floater"); 129 gFloaterCamera = new LLFloaterCamera("camera floater");
134
135 gFloaterCamera->open();
136 } 130 }
137 131 gFloaterCamera->open(); /* Flawfinder: ignore */
138 gSavedSettings.setBOOL("ShowCameraControls", TRUE); 132 gSavedSettings.setBOOL("ShowCameraControls", TRUE);
139} 133}
140 134