Permalink
Browse files

Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer

  • Loading branch information...
miKa-pyon committed Jun 8, 2016
2 parents a95b834 + 01bd9ba commit c2c8e7f281e37266bb104fb567b8cf97b6cc4c4b
@@ -3028,7 +3028,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;
@@ -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;
@@ -142,6 +142,4 @@ class LLFloaterDirectory : public LLFloater
static LLFloaterDirectory *sInstance;
};
extern BOOL gDisplayEventHack;
#endif // LL_LLDIRECTORYFLOATER_H
@@ -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));
@@ -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<LLTextBox>("stat_btn");
mStatBtn->setClickedCallback(boost::bind(LLFloaterStats::toggleInstance, LLSD()));
}
LLStatusBar::~LLStatusBar()
@@ -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");

0 comments on commit c2c8e7f

Please sign in to comment.