indra/llmessage/llexperiencecache.cpp

@@ -296,7 +296,7 @@ void LLExperienceCache::requestExperiencesCoro(LLCoreHttpUtil::HttpCoroutineAdap
         const LLSD& row = *it;
         LLUUID public_key = row[EXPERIENCE_ID].asUUID();
 
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
         LL_DEBUGS("ExperienceCache") << "Received result for " << public_key
             << " display '" << row[LLExperienceCache::NAME].asString() << "'" << LL_ENDL;
 #endif
@@ -478,7 +478,7 @@ bool LLExperienceCache::fetch(const LLUUID& key, bool refresh/* = true*/)
 {
 	if(!key.isNull() && !isRequestPending(key) && (refresh || mCache.find(key)==mCache.end()))
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 		LL_DEBUGS("ExperienceCache") << " queue request for " << EXPERIENCE_ID << " " << key << LL_ENDL;
 #endif
 

indra/llmessage/llsdmessagebuilder.cpp

@@ -385,7 +385,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
 void LLSDMessageBuilder::copyFromLLSD(const LLSD& msg)
 {
 	mCurrentMessage = msg;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 	LL_DEBUGS() << LLSDNotationStreamer(mCurrentMessage) << LL_ENDL;
 #endif
 }

indra/llmessage/message.h

@@ -64,10 +64,10 @@
 #include "llcoros.h"
 #include LLCOROS_MUTEX_HEADER
 
-const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
-const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
+constexpr U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
+constexpr U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
 
-const S32 MESSAGE_MAX_PER_FRAME = 400;
+constexpr S32 MESSAGE_MAX_PER_FRAME = 400;
 
 class LLMessageStringTable final : public LLSingleton<LLMessageStringTable>
 {

indra/llplugin/llplugininstance.cpp

@@ -174,7 +174,7 @@ void LLPluginInstance::receiveMessage(const char *message_string)
 {
 	if(mOwner)
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 		LL_DEBUGS("Plugin") << "processing incoming message: \"" << message_string << "\"" << LL_ENDL;
 #endif
 		mOwner->receivePluginMessage(message_string);

indra/llplugin/llpluginprocesschild.cpp

@@ -339,7 +339,7 @@ void LLPluginProcessChild::sendMessageToParent(const LLPluginMessage &message)
 {
 	std::string buffer = message.generate();
 
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 	LL_DEBUGS("Plugin") << "Sending to parent: " << buffer << LL_ENDL;
 #endif
 
@@ -349,7 +349,7 @@ void LLPluginProcessChild::sendMessageToParent(const LLPluginMessage &message)
 void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
 {
 	// Incoming message from the TCP Socket
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 	LL_DEBUGS("Plugin") << "Received from parent: " << message << LL_ENDL;
 #endif
 
@@ -490,7 +490,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
 /* virtual */
 void LLPluginProcessChild::receivePluginMessage(const std::string &message)
 {
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 	LL_DEBUGS("Plugin") << "Received from plugin: " << message << LL_ENDL;
 #endif
 
@@ -575,7 +575,7 @@ void LLPluginProcessChild::receivePluginMessage(const std::string &message)
 
 	if (passMessage)
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 		LL_DEBUGS("Plugin") << "Passing through to parent: " << message << LL_ENDL;
 #endif
 		writeMessageRaw(message);
@@ -598,7 +598,7 @@ void LLPluginProcessChild::receivePluginMessage(const std::string &message)
 
 void LLPluginProcessChild::setState(EState state)
 {
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 	LL_DEBUGS("Plugin") << "setting state to " << state << LL_ENDL;
 #endif
 	mState = state;

indra/llprimitive/llgltfloader.cpp

@@ -44,10 +44,14 @@
 // TINYGLTF_NO_INCLUDE_STB_IMAGE
 // TINYGLTF_NO_INCLUDE_STB_IMAGE_WRITE
 
-#include <nlohmann/json.hpp>
+#include <boost/json.hpp>
 
-#ifndef TINYGLTF_NO_INCLUDE_JSON
-#define TINYGLTF_NO_INCLUDE_JSON 1
+#ifndef TINYGLTF_USE_BOOSTJSON
+#define TINYGLTF_USE_BOOSTJSON 1
+#endif
+
+#ifndef TINYGLTF_NO_INCLUDE_BOOSTJSON
+#define TINYGLTF_NO_INCLUDE_BOOSTJSON 1
 #endif
 #undef STRICT
 #include "tinygltf/tiny_gltf.h"

indra/llprimitive/llgltfloader.h

@@ -27,10 +27,14 @@
 #ifndef LL_LLGLTFLoader_H
 #define LL_LLGLTFLoader_H
 
-#include <nlohmann/json.hpp>
+#include <boost/json.hpp>
 
-#ifndef TINYGLTF_NO_INCLUDE_JSON
-#define TINYGLTF_NO_INCLUDE_JSON 1
+#ifndef TINYGLTF_USE_BOOSTJSON
+#define TINYGLTF_USE_BOOSTJSON 1
+#endif
+
+#ifndef TINYGLTF_NO_INCLUDE_BOOSTJSON
+#define TINYGLTF_NO_INCLUDE_BOOSTJSON 1
 #endif
 #undef STRICT
 #include "tinygltf/tiny_gltf.h"

indra/llprimitive/llgltfmaterial.cpp

@@ -32,10 +32,14 @@
 #include "llsdserialize.h"
 
 // NOTE -- this should be the one and only place tiny_gltf.h is included
-#include <nlohmann/json.hpp>
+#include <boost/json.hpp>
 
-#ifndef TINYGLTF_NO_INCLUDE_JSON
-#define TINYGLTF_NO_INCLUDE_JSON 1
+#ifndef TINYGLTF_USE_BOOSTJSON
+#define TINYGLTF_USE_BOOSTJSON 1
+#endif
+
+#ifndef TINYGLTF_NO_INCLUDE_BOOSTJSON
+#define TINYGLTF_NO_INCLUDE_BOOSTJSON 1
 #endif
 #undef STRICT
 #include "tinygltf/tiny_gltf.h"

indra/llprimitive/llprimitive.cpp

@@ -1414,7 +1414,7 @@ S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name
 	tec.face_count = llmin((U32)getNumTEs(),(U32)LLTEContents::MAX_TES);
 
 	U8 *cur_ptr = tec.packed_buffer;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
     LL_DEBUGS("TEXTUREENTRY") << "Texture Entry with buffere sized: " << tec.size << LL_ENDL;
 #endif
     U8 *buffer_end = tec.packed_buffer + tec.size;
@@ -1550,7 +1550,7 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
 	U32 i;
 
     U8 *cur_ptr = packed_buffer;
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
     LL_DEBUGS("TEXTUREENTRY") << "Texture Entry with buffer sized: " << size << LL_ENDL;
 #endif
     U8 *buffer_end = packed_buffer + size;

indra/llprimitive/tests/llgltfmaterial_test.cpp

@@ -48,10 +48,14 @@
 // implementation to be defined in order for llprimitive to link correctly.
 #define TINYGLTF_NO_EXTERNAL_IMAGE 1
 
-#include <nlohmann/json.hpp>
+#include <boost/json.hpp>
 
-#ifndef TINYGLTF_NO_INCLUDE_JSON
-#define TINYGLTF_NO_INCLUDE_JSON 1
+#ifndef TINYGLTF_USE_BOOSTJSON
+#define TINYGLTF_USE_BOOSTJSON 1
+#endif
+
+#ifndef TINYGLTF_NO_INCLUDE_BOOSTJSON
+#define TINYGLTF_NO_INCLUDE_BOOSTJSON 1
 #endif
 #undef STRICT
 #include "tinygltf/tiny_gltf.h"

indra/llrender/llrender.cpp

@@ -259,7 +259,7 @@ bool LLTexUnit::bind(LLTexture* texture, bool for_rendering, bool forceBind)
 		}
 		else
 		{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 			if (texture)
 			{
 				LL_DEBUGS() << "NULL LLTexUnit::bind GL image" << LL_ENDL;
@@ -289,7 +289,7 @@ bool LLTexUnit::bind(LLImageGL* texture, bool for_rendering, bool forceBind, S32
 
 	if(!texture)
 	{
-#if SHOW_DEBUG
+#ifdef SHOW_DEBUG
 		LL_DEBUGS() << "NULL LLTexUnit::bind texture" << LL_ENDL;
 #endif
 		return false;

indra/llui/llbutton.cpp

@@ -444,12 +444,10 @@ BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
 			setFocus(TRUE);
 		}
 
-#if SHOW_DEBUG
 		if (!mFunctionName.empty())
 		{
 			LL_DEBUGS("UIUsage") << "calling mouse down function " << mFunctionName << LL_ENDL;
 		}
-#endif
 
 		/*
 		 * ATTENTION! This call fires another mouse down callback.
@@ -629,13 +627,6 @@ BOOL LLButton::handleHover(S32 x, S32 y, MASK mask)
 	return TRUE;
 }
 
-void LLButton::updateCurrencySymbols()
-{
-    mUnselectedLabel.dirty();
-    mSelectedLabel.dirty();
-    mDisabledSelectedLabel.dirty();
-}
-
 void LLButton::getOverlayImageSize(S32& overlay_width, S32& overlay_height)
 {
 	overlay_width = mImageOverlay->getWidth();

indra/llui/llbutton.h

@@ -289,8 +289,6 @@ class LLButton
 	
 	void 		setAutoResize(bool auto_resize) { mAutoResize = auto_resize; }
 
-    void        updateCurrencySymbols();
-
 protected:
 	LLPointer<LLUIImage> getImageUnselected() const	{ return mImageUnselected; }
 	LLPointer<LLUIImage> getImageSelected() const	{ return mImageSelected; }

indra/llui/llfloater.cpp

@@ -561,7 +561,6 @@ void LLFloater::enableResizeCtrls(bool enable, bool width, bool height)
 
 void LLFloater::destroy()
 {
-	gFloaterView->onDestroyFloater(this);
 	// LLFloaterReg should be synchronized with "dead" floater to avoid returning dead instance before
 	// it was deleted via LLMortician::updateClass(). See EXT-8458.
 	LLFloaterReg::removeInstance(mInstanceName, mKey);
@@ -1756,9 +1755,7 @@ BOOL LLFloater::handleScrollWheel(S32 x, S32 y, S32 clicks)
 // virtual
 BOOL LLFloater::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-#if SHOW_DEBUG
 	LL_DEBUGS() << "LLFloater::handleMouseUp calling LLPanel (really LLView)'s handleMouseUp (first initialized xui to: " << getPathname() << " )" << LL_ENDL;
-#endif
 	BOOL handled = LLPanel::handleMouseUp(x,y,mask); // Not implemented in LLPanel so this actually calls LLView
 
 #if AL_VIEWER_EVENT_RECORDER
@@ -2241,13 +2238,6 @@ void LLFloater::updateTransparency(ETypeTransparency transparency_type)
 	updateTransparency(this, transparency_type);
 }
 
-void LLFloater::updateCurrencySymbol()
-{
-    mTitle.dirty();
-    mShortTitle.dirty();
-    applyTitle();
-}
-
 void	LLFloater::setCanMinimize(BOOL can_minimize)
 {
 	// if removing minimize/restore button programmatically,
@@ -2756,7 +2746,8 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 	if (!child)
 		return;
 
-	if (!mFrontChild.isDead() && mFrontChild.get() == child)
+	LLFloater* front_child = mFrontChildHandle.get();
+	if (front_child == child)
 	{
 		if (give_focus && child->canFocusStealFrontmost() && !gFocusMgr.childHasKeyboardFocus(child))
 		{
@@ -2765,12 +2756,12 @@ void LLFloaterView::bringToFront(LLFloater* child, BOOL give_focus, BOOL restore
 		return;
 	}
 
-	if (!mFrontChild.isDead())
+	if (front_child && front_child->getVisible())
 	{
-		mFrontChild.get()->goneFromFront();
+		front_child->goneFromFront();
 	}
 
-	mFrontChild = child->getHandle();
+	mFrontChildHandle = child->getHandle();
 
 	// *TODO: make this respect floater's mAutoFocus value, instead of
 	// using parameter
@@ -3274,7 +3265,8 @@ LLFloater *LLFloaterView::getBackmost() const
 
 void LLFloaterView::syncFloaterTabOrder()
 {
-	if (!mFrontChild.isDead() && mFrontChild.get() && mFrontChild.get()->getIsChrome())
+	LLFloater* front_child = mFrontChildHandle.get();
+	if (front_child && front_child->getIsChrome())
 		return;
 
 	// look for a visible modal dialog, starting from first
@@ -3316,11 +3308,12 @@ void LLFloaterView::syncFloaterTabOrder()
 			LLFloater* floaterp = static_cast<LLFloater*>(*child_it);
 			if (gFocusMgr.childHasKeyboardFocus(floaterp))
 			{
-                if (!mFrontChild.isDead() && mFrontChild.get() != floaterp)
+				LLFloater* front_child = mFrontChildHandle.get();
+                if (front_child != floaterp)
                 {
                     // Grab a list of the top floaters that want to stay on top of the focused floater
 					std::list<LLFloater*> listTop;
-					if (mFrontChild.get() && !mFrontChild.get()->canFocusStealFrontmost())
+					if (front_child && !front_child->canFocusStealFrontmost())
                     {
                         for (LLView* childp : *getChildList())
                         {
@@ -3340,7 +3333,7 @@ void LLFloaterView::syncFloaterTabOrder()
 						{
 							sendChildToFront(childp);
 						}
-						mFrontChild = listTop.back()->getHandle();
+						mFrontChildHandle = listTop.back()->getHandle();
 					}
                 }
 
@@ -3436,14 +3429,6 @@ void LLFloaterView::setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LL
 	}
 }
 
-void LLFloaterView::onDestroyFloater(LLFloater* floater)
-{
-    if (mFrontChild.get() == floater)
-    {
-		mFrontChild = {};
-    }
-}
-
 void LLFloater::setInstanceName(const std::string& name)
 {
 	if (name != mInstanceName)

indra/llui/llfloater.h

@@ -403,8 +403,6 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
 
 	void			updateTransparency(ETypeTransparency transparency_type);
 		
-    void            updateCurrencySymbol();
-
 	void			enableResizeCtrls(bool enable, bool width = true, bool height = true);
 
 	bool			isPositioning(LLFloaterEnums::EOpenPositioning p) const { return (p == mPositioning); }
@@ -655,7 +653,6 @@ class LLFloaterView : public LLUICtrl
 	LLFloater* getFrontmostClosableFloater(); 
 
 	void setToolbarRect(LLToolBarEnums::EToolBarLocation tb, const LLRect& toolbar_rect);
-	void onDestroyFloater(LLFloater* floater);
 
 private:
 	void hiddenFloaterClosed(LLFloater* floater);
@@ -672,7 +669,7 @@ class LLFloaterView : public LLUICtrl
 	S32				mMinimizePositionVOffset;
 	typedef std::vector<std::pair<LLHandle<LLFloater>, boost::signals2::connection> > hidden_floaters_t;
 	hidden_floaters_t mHiddenFloaters;
-	LLHandle<LLFloater>		mFrontChild;
+	LLHandle<LLFloater>		mFrontChildHandle;
 };
 
 //

indra/llui/llmenugl.cpp

@@ -3931,6 +3931,7 @@ LLTearOffMenu::LLTearOffMenu(LLMenuGL* menup) :
 	setName(menup->getName());
 	setTitle(menup->getLabel());
 	setCanMinimize(FALSE);
+	setCanCollapse(FALSE);
 	// flag menu as being torn off
 	menup->setTornOff(TRUE);
 	// update menu layout as torn off menu (no spillover menus)

indra/llui/llnotifications.cpp

@@ -241,10 +241,8 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLNotifica
 			*it = it->beginMap()->second;
 		}
 	}
-#if SHOW_DEBUG
-	LL_DEBUGS("Notifications") << name << LL_ENDL;
-	LL_DEBUGS("Notifications") << ll_pretty_print_sd(mFormData) << LL_ENDL;
-#endif
+
+	LL_DEBUGS("Notifications") << name << LL_NEWLINE << ll_pretty_print_sd(mFormData) << LL_ENDL;
 }
 
 LLNotificationForm::LLNotificationForm(const LLSD& sd)
@@ -436,9 +434,7 @@ LLNotificationTemplate::LLNotificationTemplate(const LLNotificationTemplate::Par
 		mUniqueContext.push_back(context.value);
 	}
 
-#if SHOW_DEBUG
 	LL_DEBUGS("Notifications") << "notification \"" << mName << "\": tag count is " << p.tags.size() << LL_ENDL;
-#endif
 
 	for (const LLNotificationTemplate::Tag& tag : p.tags)
 	{
@@ -1497,9 +1493,7 @@ void replaceSubstitutionStrings(LLXMLNodePtr node, StringMap& replacements)
 			if (found != replacements.end())
 			{
 				replacement = found->second;
-#if SHOW_DEBUG
 				LL_DEBUGS("Notifications") << "replaceSubstitutionStrings: value: \"" << value << "\" repl: \"" << replacement << "\"." << LL_ENDL;
-#endif
 				it->second->setValue(replacement);
 			}
 			else

indra/llui/llpanel.cpp

@@ -822,9 +822,7 @@ BOOL LLPanel::buildFromFile(const std::string& filename, const LLPanel::Params&
 		return didPost;
 	}
 
-#if SHOW_DEBUG
 	LL_DEBUGS() << "Building panel " << filename << LL_ENDL;
-#endif
 
 	LLUICtrlFactory::instance().pushFileName(filename);
 	{

indra/llui/lltextbox.cpp

@@ -166,12 +166,6 @@ BOOL LLTextBox::setTextArg( const std::string& key, const LLStringExplicit& text
 	return TRUE;
 }
 
-void LLTextBox::updateCurrencySymbols()
-{
-    mLabel.dirty();
-    mText.dirty();
-    LLTextBase::setText(mText.getString());
-}
 
 void LLTextBox::reshapeToFitText(BOOL called_from_parent)
 {

indra/llui/lltextbox.h

@@ -69,8 +69,6 @@ class LLTextBox :
 	/*virtual*/ LLSD	getValue() const;
 	/*virtual*/ BOOL	setTextArg( const std::string& key, const LLStringExplicit& text );
 
-    void updateCurrencySymbols();
-
 	void			setShowCursorHand(bool show_cursor) { mShowCursorHand = show_cursor; }
 
 protected: