From 1977db538a4f5e8c196995b8d5e149b40355fe7d Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Tue, 26 Apr 2022 06:59:00 -0400
Subject: [PATCH] Glue in initial lightbox floater
---
indra/newview/CMakeLists.txt | 2 ++
indra/newview/alfloaterlightbox.cpp | 42 ++++++++++++++++++++++
indra/newview/alfloaterlightbox.h | 47 +++++++++++++++++++++++++
indra/newview/app_settings/commands.xml | 4 +--
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llviewerfloaterreg.cpp | 3 +-
6 files changed, 96 insertions(+), 4 deletions(-)
create mode 100644 indra/newview/alfloaterlightbox.cpp
create mode 100644 indra/newview/alfloaterlightbox.h
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4e50fc10fc7..aac35f01b59 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -128,6 +128,7 @@ set(viewer_SOURCE_FILES
alfloaterao.cpp
alfloaterexploresounds.cpp
alfloatergenerictext.cpp
+ alfloaterlightbox.cpp
alfloaterparticleeditor.cpp
alfloaterregiontracker.cpp
alpanelaomini.cpp
@@ -805,6 +806,7 @@ set(viewer_HEADER_FILES
alfloaterao.h
alfloaterexploresounds.h
alfloatergenerictext.h
+ alfloaterlightbox.h
alfloaterparticleeditor.h
alfloaterregiontracker.h
alpanelaomini.h
diff --git a/indra/newview/alfloaterlightbox.cpp b/indra/newview/alfloaterlightbox.cpp
new file mode 100644
index 00000000000..e4621971cf3
--- /dev/null
+++ b/indra/newview/alfloaterlightbox.cpp
@@ -0,0 +1,42 @@
+/**
+ * @file alfloaterlightbox.cpp
+ * @brief A generic text floater for dumping info (usually debug info)
+ *
+ * Copyright (c) 2022, Rye Mutt <rye@alchemyviewer.org>
+ *
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ *
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "llviewerprecompiledheaders.h"
+#include "alfloaterlightbox.h"
+
+ALFloaterLightBox::ALFloaterLightBox(const LLSD& key)
+: LLFloater(key)
+{
+}
+
+BOOL ALFloaterLightBox::postBuild()
+{
+ return TRUE;
+}
\ No newline at end of file
diff --git a/indra/newview/alfloaterlightbox.h b/indra/newview/alfloaterlightbox.h
new file mode 100644
index 00000000000..5f417a23ca8
--- /dev/null
+++ b/indra/newview/alfloaterlightbox.h
@@ -0,0 +1,47 @@
+/**
+ * @file alfloaterlightbox.h
+ * @brief A generic text floater for dumping info (usually debug info)
+ *
+ * Copyright (c) 2022, Rye Mutt <rye@alchemyviewer.org>
+ *
+ * Permission is hereby granted, free of charge, to any person or organization
+ * obtaining a copy of the software and accompanying documentation covered by
+ * this license (the "Software") to use, reproduce, display, distribute,
+ * execute, and transmit the Software, and to prepare derivative works of the
+ * Software, and to permit third-parties to whom the Software is furnished to
+ * do so, all subject to the following:
+ *
+ * The copyright notices in the Software and this entire statement, including
+ * the above license grant, this restriction and the following disclaimer,
+ * must be included in all copies of the Software, in whole or in part, and
+ * all derivative works of the Software, unless such copies or derivative
+ * works are solely in the form of machine-executable object code generated by
+ * a source language processor.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#pragma once
+
+#ifndef AL_FLOATERLIGHTBOX_H
+#define AL_FLOATERLIGHTBOX_H
+
+#include "llfloater.h"
+
+class ALFloaterLightBox final : public LLFloater
+{
+public:
+ ALFloaterLightBox(const LLSD& key);
+ BOOL postBuild() override;
+private:
+
+};
+
+#endif // AL_FLOATERLIGHTBOX_H
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index de35d248361..5dc1b147cca 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -242,9 +242,9 @@
label_ref="Command_Lightbox_Settings_Label"
tooltip_ref="Command_Lightbox_Settings_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
- execute_parameters="lightbox_settings"
+ execute_parameters="lightbox"
is_running_function="Floater.IsOpen"
- is_running_parameters="lightbox_settings"
+ is_running_parameters="lightbox"
/>
<command name="regiontracker"
available_in_toybox="true"
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b54ea41fa6f..20bd9624ce8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10633,7 +10633,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>512</integer>
+ <integer>4096</integer>
</map>
<key>RenderNameFadeDuration</key>
<map>
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index c359abc4076..2f062b26483 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -34,6 +34,7 @@
#include "alfloaterao.h"
#include "alfloaterexploresounds.h"
#include "alfloatergenerictext.h"
+#include "alfloaterlightbox.h"
#include "alfloaterparticleeditor.h"
#include "alfloaterregiontracker.h"
#include "llcommandhandler.h"
@@ -421,7 +422,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("ao", "floater_ao.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<ALFloaterAO>);
LLFloaterReg::add("delete_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDeleteQueue>);
LLFloaterReg::add("generic_text", "floater_generic_text.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterGenericText>);
- LLFloaterReg::add("lightbox_settings", "floater_lightbox_settings.xml", (LLFloaterBuildFunc) &LLFloaterReg::build<LLFloater>);
+ LLFloaterReg::add("lightbox", "floater_lightbox_settings.xml", (LLFloaterBuildFunc) &LLFloaterReg::build<ALFloaterLightBox>);
LLFloaterReg::add("music_ticker", "floater_music_ticker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
LLFloaterReg::add("particle_editor", "floater_particle_editor.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<ALFloaterParticleEditor>);
LLFloaterReg::add("quick_settings", "floater_quick_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
--
GitLab