Permalink
Browse files

Merge branch 'master' of https://github.com/singularity-viewer/Singul…

…arityViewer into Release
  • Loading branch information...
2 parents a3c2009 + f77df0a commit 684ab3e3e53350c2c5319e1eb79319c31abf7276 @Lirusaito Lirusaito committed Jun 25, 2016
Showing with 14 additions and 1 deletion.
  1. +1 −0 indra/newview/llfolderview.h
  2. +8 −0 indra/newview/llinventoryactions.cpp
  3. +5 −1 indra/newview/llviewerregion.cpp
@@ -248,6 +248,7 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
void setNeedsAutoRename(BOOL val) { mNeedsAutoRename = val; }
void setPinningSelectedItem(BOOL val) { mPinningSelectedItem = val; }
void setAutoSelectOverride(BOOL val) { mAutoSelectOverride = val; }
+ bool getAutoSelectOverride() const { return mAutoSelectOverride; }
BOOL getDebugFilters() { return mDebugFilters; }
@@ -173,7 +173,15 @@ void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, const LLSD& sdtyp
LLFolderType::FT_NONE, LLStringUtil::null);
}
model->notifyObservers();
+
+ // Singu Note: SV-2036
+ // Hack! setSelection sets category to fetching state, which disables scrolling. Scrolling, however, is desired.
+ // Setting autoSelectOverride to true just happens to skip the fetch check, thus allowing the scroll to proceed.
+ bool autoselected = ptr->getRootFolder()->getAutoSelectOverride();
+ ptr->getRootFolder()->setAutoSelectOverride(true);
ptr->setSelection(category, TRUE);
+ // Restore autoSelectOverride to whatever it was before we hijacked it.
+ ptr->getRootFolder()->setAutoSelectOverride(autoselected);
}
else if ("lsl" == type)
{
@@ -2315,7 +2315,11 @@ bool LLViewerRegion::meshUploadEnabled() const
bool LLViewerRegion::meshRezEnabled() const
{
- if (getCapability("SimulatorFeatures").empty())
+ if (!capabilitiesReceived())
+ {
+ return false;
+ }
+ else if (getCapability("SimulatorFeatures").empty())
{
return !getCapability("GetMesh").empty() || !getCapability("GetMesh2").empty();
}

0 comments on commit 684ab3e

Please sign in to comment.