Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Release

Browse Source
This commit is contained in:
Lirusaito
2016-06-24 21:35:12 -04:00
parent a3c2009a48 f77df0ab83
commit 684ab3e3e5
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llfolderview.h
View File

@@ -248,6 +248,7 @@ public:
void setNeedsAutoRename(BOOL val) { mNeedsAutoRename = val; } void setNeedsAutoRename(BOOL val) { mNeedsAutoRename = val; }
void setPinningSelectedItem(BOOL val) { mPinningSelectedItem = val; } void setPinningSelectedItem(BOOL val) { mPinningSelectedItem = val; }
void setAutoSelectOverride(BOOL val) { mAutoSelectOverride = val; } void setAutoSelectOverride(BOOL val) { mAutoSelectOverride = val; }
bool getAutoSelectOverride() const { return mAutoSelectOverride; }
BOOL getDebugFilters() { return mDebugFilters; } BOOL getDebugFilters() { return mDebugFilters; }

8
indra/newview/llinventoryactions.cpp
View File

@@ -173,7 +173,15 @@ void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, const LLSD& sdtyp
LLFolderType::FT_NONE, LLStringUtil::null); LLFolderType::FT_NONE, LLStringUtil::null);
} }
model->notifyObservers(); 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); ptr->setSelection(category, TRUE);
// Restore autoSelectOverride to whatever it was before we hijacked it.
ptr->getRootFolder()->setAutoSelectOverride(autoselected);
} }
else if ("lsl" == type) else if ("lsl" == type)
{ {

6
indra/newview/llviewerregion.cpp
View File

@@ -2315,7 +2315,11 @@ bool LLViewerRegion::meshUploadEnabled() const
bool LLViewerRegion::meshRezEnabled() 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(); return !getCapability("GetMesh").empty() || !getCapability("GetMesh2").empty();
} }