From 6847833752f8c4cc7cf913cb547b668fce1b2e8b Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 5 Jun 2016 12:58:15 -0400 Subject: [PATCH 1/4] Feature Request: Make stats indicator on status bar open stats floater. --- indra/newview/llstatusbar.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 1e17dd14a..667a91893 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -45,6 +45,7 @@ #include "llfloaterregioninfo.h" #include "llfloaterscriptdebug.h" #include "llfloatersearch.h" +#include "llfloaterstats.h" #include "llhudicon.h" #include "llkeyboard.h" #include "lllineeditor.h" @@ -275,6 +276,7 @@ mIsNavMeshDirty(false) addChild(mSGPacketLoss); mStatBtn = getChild("stat_btn"); + mStatBtn->setClickedCallback(boost::bind(LLFloaterStats::toggleInstance, LLSD())); } LLStatusBar::~LLStatusBar() From 548d1b675765d60dc16ccd8ad7e97beeb98d2cb9 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sun, 5 Jun 2016 13:26:12 -0400 Subject: [PATCH 2/4] Solve SV-2042: Description on event notice now opens a floater, not search. --- indra/newview/lleventnotifier.cpp | 5 ++--- indra/newview/llfloaterdirectory.h | 2 -- indra/newview/llpaneldirevents.cpp | 9 +-------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp index 7aae068ad..f4b583a53 100644 --- a/indra/newview/lleventnotifier.cpp +++ b/indra/newview/lleventnotifier.cpp @@ -39,7 +39,7 @@ #include "llnotify.h" #include "lleventinfo.h" -#include "llfloaterdirectory.h" +#include "llfloaterevent.h" #include "llfloaterworldmap.h" #include "llagent.h" #include "llappviewer.h" // for gPacificDaylightTime @@ -104,8 +104,7 @@ bool LLEventNotifier::handleResponse(U32 eventId, LLVector3d eventPos, const LLS gFloaterWorldMap->trackLocation(eventPos); break; case 1: - gDisplayEventHack = TRUE; - LLFloaterDirectory::showEvents(eventId); + LLFloaterEventInfo::show(eventId); break; case 2: break; diff --git a/indra/newview/llfloaterdirectory.h b/indra/newview/llfloaterdirectory.h index e685b8d30..792c578d3 100644 --- a/indra/newview/llfloaterdirectory.h +++ b/indra/newview/llfloaterdirectory.h @@ -142,6 +142,4 @@ private: static LLFloaterDirectory *sInstance; }; -extern BOOL gDisplayEventHack; - #endif // LL_LLDIRECTORYFLOATER_H diff --git a/indra/newview/llpaneldirevents.cpp b/indra/newview/llpaneldirevents.cpp index 6f5412cef..eed058cc9 100644 --- a/indra/newview/llpaneldirevents.cpp +++ b/indra/newview/llpaneldirevents.cpp @@ -52,8 +52,6 @@ #include "llnotificationsutil.h" #include "llviewerregion.h" -BOOL gDisplayEventHack = FALSE; - LLPanelDirEvents::LLPanelDirEvents(const std::string& name, LLFloaterDirectory* floater) : LLPanelDirBrowser(name, floater), mDoneQuery(FALSE), @@ -85,12 +83,7 @@ BOOL LLPanelDirEvents::postBuild() mCurrentSortColumn = "time"; - if (!gDisplayEventHack) - { - setDay(0); // for today - //performQuery(); // Temporary change to help DB - Sabin - } - gDisplayEventHack = FALSE; + setDay(0); // for today LLViewerRegion* region(gAgent.getRegion()); getChildView("filter_gaming")->setVisible(region && (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_EVENTS)); From b8a2122b28692af20b1bda9ee9ada1a6a7b1ee6e Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 8 Jun 2016 15:42:19 -0400 Subject: [PATCH 3/4] Fix SV-2054 --- indra/llui/lltexteditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 0412c302e..aa305c831 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -3019,7 +3019,7 @@ void LLTextEditor::drawSelectionBackground() { gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); const LLColor4& color = mReadOnly ? mReadOnlyBgColor : mWriteableBgColor; - F32 alpha = hasFocus() ? 1.f : 0.5f; + F32 alpha = hasFocus() ? 1.f : 0.8f; gGL.color4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha ); S32 margin_offset = mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0; From 01bd9baf54a1c450cd1beb2548dd4ef7e03e8a95 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Wed, 8 Jun 2016 15:43:32 -0400 Subject: [PATCH 4/4] Fix AvatarRenderInfo not reporting. --- indra/newview/llviewerregion.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 1a389ab05..d4ea905af 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1889,6 +1889,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("AgentState"); capabilityNames.append("AttachmentResources"); //capabilityNames.append("AvatarPickerSearch"); //Display name/SLID lookup (llfloateravatarpicker.cpp) + capabilityNames.append("AvatarRenderInfo"); capabilityNames.append("CharacterProperties"); capabilityNames.append("ChatSessionRequest"); capabilityNames.append("CopyInventoryFromNotecard");