diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt
index 3416b7ba48..8c7bdb61ad 100755
--- a/README_BUILD_FIRESTORM_LINUX.txt
+++ b/README_BUILD_FIRESTORM_LINUX.txt
@@ -18,9 +18,9 @@ mailing list. We've created a non-KDU build target to make this easier. Everywhe
Available premade firestorm-specific build targets:
- ReleaseFS (includes KDU, FMOD)
- ReleaseFS_open (no KDU, no FMOD)
- RelWithDebInfoFS_open (no KDU, no FMOD)
+ ReleaseFS (includes KDU, FMOD)
+ ReleaseFS_open (no KDU, no FMOD)
+ RelWithDebInfoFS_open (no KDU, no FMOD)
To build firestorm:
@@ -41,10 +41,7 @@ Typical LL autobuild configure options should also work, as long as they don't d
already doing.
Logs:
-
Look for logs in build-linux-i686/logs
Output:
-
Look for output in build-linux-i686/newview/Release
-
diff --git a/README_BUILD_FIRESTORM_MACOSX.txt b/README_BUILD_FIRESTORM_MACOSX.txt
index 529bba70d5..c44631128e 100755
--- a/README_BUILD_FIRESTORM_MACOSX.txt
+++ b/README_BUILD_FIRESTORM_MACOSX.txt
@@ -32,16 +32,15 @@ build, using openjpeg instead of KDU.
Available premade firestorm-specific build targets:
- ReleaseFS (includes KDU, FMOD)
- ReleaseFS_open (no KDU, no FMOD)
- RelWithDebInfo_open (no KDU, no FMOD)
+ ReleaseFS (includes KDU, FMOD)
+ ReleaseFS_open (no KDU, no FMOD)
+ RelWithDebInfo_open (no KDU, no FMOD)
To build firestorm:
autobuild build -c ReleaseFS
Other examples:
-
autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure
autobuild configure -c ReleaseFS -- --clean # clean the output area first, then configure
autobuild configure -c ReleaseFS -- --chan Private-Yourname # configure with a custom channel
diff --git a/README_BUILD_FIRESTORM_WIN32.txt b/README_BUILD_FIRESTORM_WIN32.txt
index aaf4c73734..a9690dcd64 100755
--- a/README_BUILD_FIRESTORM_WIN32.txt
+++ b/README_BUILD_FIRESTORM_WIN32.txt
@@ -2,7 +2,7 @@ Before you start configuring your Windows build system, be aware of our tested c
Memory: You will need at least 2GB RAM, 4GB strongly recommended.
CPU: Multiple CPUs are strongly recommended.
A build can take over an hour.
- Visual Studio 2010.
+ Visual Studio 2010 SP1.
Ensure you can build a stock viewer-development try as described in the SL wiki. Before asking for any help
compiling Firestorm, make sure you can build viewer-development first. If you try and skip this step, you may
@@ -32,9 +32,9 @@ After launching the VS2010 cmd shell and navigating to your firestorm code repo:
Other build targets you may use are:
- ReleaseFS (includes KDU, FMOD)
- ReleaseFS_open (no KDU, no FMOD)
- RelWithDebInfoFS_open (no KDU, no FMOD)
+ ReleaseFS (includes KDU, FMOD)
+ ReleaseFS_open (no KDU, no FMOD)
+ RelWithDebInfoFS_open (no KDU, no FMOD)
Other examples:
autobuild configure -c ReleaseFS # basic configuration step, don't build, just configure
diff --git a/README_BUILD_FIRESTORM_WIN64.txt b/README_BUILD_FIRESTORM_WIN64.txt
index 6995ad2313..5e48852ac3 100755
--- a/README_BUILD_FIRESTORM_WIN64.txt
+++ b/README_BUILD_FIRESTORM_WIN64.txt
@@ -1,7 +1,7 @@
This is WIP. Please change/expand when seeing fit.
1.1 Visual Studio 2010 Pro or better with installed 64 bit compiler.
-1.2 Or Visual Studio Express and 'Microsoft Windows SDK for Windows 7 and .NET Framework 4'. Make sure to install at least the header and compiler.
+1.2 Or Visual Studio Express and 'Microsoft Windows SDK for Windows 7 and .NET Framework 4'. Make sure to install at least the header and compiler with all the latest service packs.
2. autobuild from https://bitbucket.org/NickyD/autobuild
3. FMOD, if you want sound, please see https://bitbucket.org/NickyD/3p-fmodex
diff --git a/autobuild.xml b/autobuild.xml
index 63b94f26c2..d56d26c371 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1872,9 +1872,9 @@
archive
name
darwin
@@ -1884,9 +1884,9 @@
archive
name
linux
@@ -1908,9 +1908,9 @@
archive
name
windows
@@ -2404,9 +2404,9 @@
archive
name
darwin
diff --git a/indra/Version b/indra/Version
index 4cfc99d299..53e12f7c5c 100644
--- a/indra/Version
+++ b/indra/Version
@@ -1 +1 @@
-VERSION_VIEWER=4.6.8
+VERSION_VIEWER=4.7.0
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 7c56bb6995..270cb42215 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -251,13 +251,6 @@ elseif(DARWIN)
libgrowl++.dylib
)
- # libllqtwebkit.dylib comes from a prebuild slplugin. It needs to be fetched from somewhere else
- # when building x64/universal. Probably it's best to copy it in fs_viewer_manifest.py for those cases.
- if( NOT ND_BUILD64BIT_ARCH )
- set(release_files ${release_files} libllqtwebkit.dylib )
- endif( NOT ND_BUILD64BIT_ARCH )
- #
-
# We only ever need google breakpad when crash reporting is used
if(RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING)
set(release_files ${release_files} "libexception_handler.dylib")
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 02c8f388ea..769bd89764 100755
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -53,8 +53,12 @@ if (WINDOWS)
)
elseif (DARWIN)
set(WEBKIT_PLUGIN_LIBRARIES
- optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
- debug ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.a
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libQtWebKit.4.dylib
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libQtOpenGL.4.dylib
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libQtNetwork.4.dylib
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libQtGui.4.dylib
+ ${ARCH_PREBUILT_DIRS_RELEASE}/libQtCore.4.dylib
)
elseif (LINUX)
# FIRE-6108, add missing if clause for standalone builds - TL
@@ -74,7 +78,7 @@ elseif (LINUX)
QtGui
QtCore
jpeg
- jscore
+# jscore
fontconfig
X11
Xrender
diff --git a/indra/llmath/llcalcparser.h b/indra/llmath/llcalcparser.h
index 742f6abbd4..7bb2384938 100755
--- a/indra/llmath/llcalcparser.h
+++ b/indra/llmath/llcalcparser.h
@@ -89,6 +89,14 @@ struct LLCalcParser : grammar
(str_p("ASIN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_asin)(self,arg1)]) |
(str_p("ACOS") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_acos)(self,arg1)]) |
(str_p("ATAN") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_atan)(self,arg1)]) |
+ // FIRE-14618: Provide radian-based functions
+ (str_p("SINR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_sinr)(self,arg1)]) |
+ (str_p("COSR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_cosr)(self,arg1)]) |
+ (str_p("TANR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_tanr)(self,arg1)]) |
+ (str_p("ASINR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_asinr)(self,arg1)]) |
+ (str_p("ACOSR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_acosr)(self,arg1)]) |
+ (str_p("ATANR") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_atanr)(self,arg1)]) |
+ //
(str_p("SQRT") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_sqrt)(self,arg1)]) |
(str_p("LOG") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_log)(self,arg1)]) |
(str_p("EXP") >> '(' >> expression[unary_func.value = bind(&LLCalcParser::_exp)(self,arg1)]) |
@@ -169,9 +177,17 @@ private:
F32 _sin(const F32& a) const { return sin(DEG_TO_RAD * a); }
F32 _cos(const F32& a) const { return cos(DEG_TO_RAD * a); }
F32 _tan(const F32& a) const { return tan(DEG_TO_RAD * a); }
- F32 _asin(const F32& a) const { return asin(a * RAD_TO_DEG); }
- F32 _acos(const F32& a) const { return acos(a * RAD_TO_DEG); }
- F32 _atan(const F32& a) const { return atan(a * RAD_TO_DEG); }
+ F32 _asin(const F32& a) const { return asin(a) * RAD_TO_DEG; }
+ F32 _acos(const F32& a) const { return acos(a) * RAD_TO_DEG; }
+ F32 _atan(const F32& a) const { return atan(a) * RAD_TO_DEG; }
+ // FIRE-14618: Provide radian-based functions
+ F32 _sinr(const F32& a) const { return sin(a); }
+ F32 _cosr(const F32& a) const { return cos(a); }
+ F32 _tanr(const F32& a) const { return tan(a); }
+ F32 _asinr(const F32& a) const { return asin(a); }
+ F32 _acosr(const F32& a) const { return acos(a); }
+ F32 _atanr(const F32& a) const { return atan(a); }
+ //
F32 _sqrt(const F32& a) const { return sqrt(a); }
F32 _log(const F32& a) const { return log(a); }
F32 _exp(const F32& a) const { return exp(a); }
diff --git a/indra/llrender/llglslshader.cpp b/indra/llrender/llglslshader.cpp
index 34beef6a6b..07d142c226 100755
--- a/indra/llrender/llglslshader.cpp
+++ b/indra/llrender/llglslshader.cpp
@@ -87,6 +87,7 @@ LLShaderFeatures::LLShaderFeatures()
, mIndexedTextureChannels(0)
, disableTextureIndex(false)
, hasAlphaMask(false)
+ , attachNothing(false)
{
}
@@ -119,28 +120,31 @@ struct LLGLSLShaderCompareTimeElapsed
};
//static
-void LLGLSLShader::finishProfile()
+void LLGLSLShader::finishProfile(bool emit_report)
{
sProfileEnabled = false;
- std::vector sorted;
-
- for (std::set::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+ if (emit_report)
{
- sorted.push_back(*iter);
- }
+ std::vector sorted;
- std::sort(sorted.begin(), sorted.end(), LLGLSLShaderCompareTimeElapsed());
+ for (std::set::iterator iter = sInstances.begin(); iter != sInstances.end(); ++iter)
+ {
+ sorted.push_back(*iter);
+ }
- for (std::vector::iterator iter = sorted.begin(); iter != sorted.end(); ++iter)
- {
- (*iter)->dumpStats();
- }
+ std::sort(sorted.begin(), sorted.end(), LLGLSLShaderCompareTimeElapsed());
+ for (std::vector::iterator iter = sorted.begin(); iter != sorted.end(); ++iter)
+ {
+ (*iter)->dumpStats();
+ }
+
LL_INFOS() << "-----------------------------------" << LL_ENDL;
LL_INFOS() << "Total rendering time: " << llformat("%.4f ms", sTotalTimeElapsed/1000000.f) << LL_ENDL;
LL_INFOS() << "Total samples drawn: " << llformat("%.4f million", sTotalSamplesDrawn/1000000.f) << LL_ENDL;
LL_INFOS() << "Total triangles drawn: " << llformat("%.3f million", sTotalTrianglesDrawn/1000000.f) << LL_ENDL;
+ }
}
void LLGLSLShader::clearStats()
@@ -175,7 +179,7 @@ void LLGLSLShader::dumpStats()
}
}
LL_INFOS() << "=============================================" << LL_ENDL;
-
+
F32 ms = mTimeElapsed/1000000.f;
F32 seconds = ms/1000.f;
@@ -210,7 +214,7 @@ void LLGLSLShader::startProfile()
//static
void LLGLSLShader::stopProfile(U32 count, U32 mode)
{
- if (sProfileEnabled)
+ if (sProfileEnabled && sCurBoundShaderPtr)
{
sCurBoundShaderPtr->readProfileQuery(count, mode);
}
@@ -221,6 +225,7 @@ void LLGLSLShader::placeProfileQuery()
#if !LL_DARWIN
if (mTimerQuery == 0)
{
+ glGenQueriesARB(1, &mSamplesQuery);
glGenQueriesARB(1, &mTimerQuery);
}
@@ -257,7 +262,7 @@ void LLGLSLShader::placeProfileQuery()
}
- glBeginQueryARB(GL_SAMPLES_PASSED, 1);
+ glBeginQueryARB(GL_SAMPLES_PASSED, mSamplesQuery);
glBeginQueryARB(GL_TIME_ELAPSED, mTimerQuery);
#endif
}
@@ -275,7 +280,7 @@ void LLGLSLShader::readProfileQuery(U32 count, U32 mode)
//U64 samples_passed = 0;
GLuint64 samples_passed = 0;
- glGetQueryObjectui64v(1, GL_QUERY_RESULT, &samples_passed);
+ glGetQueryObjectui64v(mSamplesQuery, GL_QUERY_RESULT, &samples_passed);
sTotalTimeElapsed += time_elapsed;
mTimeElapsed += time_elapsed;
@@ -310,14 +315,15 @@ LLGLSLShader::LLGLSLShader()
mShaderLevel(0),
mShaderGroup(SG_DEFAULT),
mUniformsDirty(FALSE),
- mTimerQuery(0)
+ mTimerQuery(0),
+ mSamplesQuery(0)
+
{
}
LLGLSLShader::~LLGLSLShader()
{
-
}
void LLGLSLShader::unload()
@@ -352,6 +358,18 @@ void LLGLSLShader::unload()
mProgramObject = 0;
}
+ if (mTimerQuery)
+ {
+ glDeleteQueriesARB(1, &mTimerQuery);
+ mTimerQuery = 0;
+ }
+
+ if (mSamplesQuery)
+ {
+ glDeleteQueriesARB(1, &mSamplesQuery);
+ mSamplesQuery = 0;
+ }
+
//hack to make apple not complain
glGetError();
diff --git a/indra/llrender/llglslshader.h b/indra/llrender/llglslshader.h
index 7b2f5f04c2..5abddf274b 100755
--- a/indra/llrender/llglslshader.h
+++ b/indra/llrender/llglslshader.h
@@ -51,6 +51,7 @@ public:
S32 mIndexedTextureChannels;
bool disableTextureIndex;
bool hasAlphaMask;
+ bool attachNothing;
// char numLights;
@@ -80,7 +81,7 @@ public:
static bool sNoFixedFunction;
static void initProfile();
- static void finishProfile();
+ static void finishProfile(bool emit_report = true);
static void startProfile();
static void stopProfile(U32 count, U32 mode);
@@ -184,6 +185,7 @@ public:
//statistcis for profiling shader performance
U32 mTimerQuery;
+ U32 mSamplesQuery;
U64 mTimeElapsed;
static U64 sTotalTimeElapsed;
U32 mTrianglesDrawn;
diff --git a/indra/llrender/llgltexture.h b/indra/llrender/llgltexture.h
index 45592ee077..a62b24c0ab 100644
--- a/indra/llrender/llgltexture.h
+++ b/indra/llrender/llgltexture.h
@@ -192,7 +192,10 @@ protected:
protected:
LLGLTextureState mTextureState ;
-
+// ND> Expose mipmap generation so we can check it for texture memory tax
+public:
+ bool getUseMipMaps() const { return mUseMipMaps; }
+//
};
#endif // LL_GL_TEXTURE_H
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 955ea450c1..cd484b4fe9 100755
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -388,6 +388,7 @@ void LLRenderTarget::release()
//
if (mFBO && (mTex.size() > 1))
{
+ glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
S32 z;
for (z = mTex.size() - 1; z >= 1; z--)
{
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index ef855e293d..35da8ab2c4 100755
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -73,7 +73,11 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
{
llassert_always(shader != NULL);
LLShaderFeatures *features = & shader->mFeatures;
-
+
+ if (features->attachNothing)
+ {
+ return TRUE;
+ }
//////////////////////////////////////
// Attach Vertex Shader Features First
//////////////////////////////////////
diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 698f3d5e3f..b0550be5db 100755
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -53,6 +53,7 @@ LLChatEntry::LLChatEntry(const Params& p)
mCurrentHistoryLine = mLineHistory.begin();
mAutoIndent = false;
+ keepSelectionOnReturn(true);
}
LLChatEntry::~LLChatEntry()
@@ -185,15 +186,6 @@ BOOL LLChatEntry::handleSpecialKey(const KEY key, const MASK mask)
{
BOOL handled = FALSE;
- // In the case of a chat entry, pressing RETURN when something is selected
- // should NOT erase the selection (unlike a notecard, for example)
- if (key == KEY_RETURN)
- {
- endOfDoc();
- startSelection();
- endSelection();
- }
-
LLTextEditor::handleSpecialKey(key, mask);
switch(key)
diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index edd26fb1a1..7840b84d8b 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -937,7 +937,10 @@ void LLComboBox::updateSelection()
mTextEntry->setTentative(FALSE);
mLastSelectedIndex = mList->getFirstSelectedIndex();
}
- else if (mList->selectItemByPrefix(left_wstring, FALSE))
+ // Allow fulltext search in comboboxes
+ //else if (mList->selectItemByPrefix(left_wstring, FALSE))
+ else if (!LLControlGroup::getInstance("Global")->getBOOL("FSComboboxSubstringSearch") && mList->selectItemByPrefix(left_wstring, FALSE))
+ //
{
LLWString selected_item = utf8str_to_wstring(getSelectedItemLabel());
LLWString wtext = left_wstring + selected_item.substr(left_wstring.size(), selected_item.size());
@@ -948,6 +951,18 @@ void LLComboBox::updateSelection()
mHasAutocompletedText = TRUE;
mLastSelectedIndex = mList->getFirstSelectedIndex();
}
+ // Allow fulltext search in comboboxes
+ else if (LLControlGroup::getInstance("Global")->getBOOL("FSComboboxSubstringSearch") && mList->selectItemBySubstring(left_wstring, FALSE))
+ {
+ LLWString selected_item = utf8str_to_wstring(getSelectedItemLabel());
+ mTextEntry->setText(wstring_to_utf8str(left_wstring) + " (" + getSelectedItemLabel() + ")");
+ mTextEntry->setSelection(left_wstring.size(), mTextEntry->getWText().size());
+ mTextEntry->endSelection();
+ mTextEntry->setTentative(FALSE);
+ mHasAutocompletedText = TRUE;
+ mLastSelectedIndex = mList->getFirstSelectedIndex();
+ }
+ //
else // no matching items found
{
mList->deselectAllItems();
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index da7b830aec..897c85f923 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -2429,7 +2429,10 @@ void LLFloaterView::restoreAll()
for ( child_list_const_iter_t child_it = getChildList()->begin(); child_it != getChildList()->end(); ++child_it)
{
LLFloater* floaterp = (LLFloater*)*child_it;
- floaterp->setMinimized(FALSE);
+ if (floaterp) // Possible fix for crash on disconnect
+ {
+ floaterp->setMinimized(FALSE);
+ }
}
// *FIX: make sure dependents are restored
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index de10a5a665..ace64311bf 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -275,6 +275,24 @@ BOOL LLFolderViewItem::passedFilter(S32 filter_generation)
return getViewModelItem()->passedFilter(filter_generation);
}
+BOOL LLFolderViewItem::isPotentiallyVisible(S32 filter_generation)
+{
+ // Item should be visible if:
+ // 1. item passed current filter
+ // 2. item was updated (gen < 0) but has descendants that passed filter
+ // 3. item was recently updated and was visible before update
+
+ LLFolderViewModelItem* model = getViewModelItem();
+ if (model->getLastFilterGeneration() < 0 && !getFolderViewModel()->getFilter().isModified())
+ {
+ return model->descendantsPassedFilter(filter_generation) || getVisible();
+ }
+ else
+ {
+ return model->passedFilter(filter_generation);
+ }
+}
+
void LLFolderViewItem::refresh()
{
LLFolderViewModelItem& vmi = *getViewModelItem();
@@ -722,7 +740,7 @@ void LLFolderViewItem::drawOpenFolderArrow(const Params& default_params, const L
//
const S32 TOP_PAD = default_params.item_top_pad;
- if (hasVisibleChildren() || getViewModelItem()->hasChildren())
+ if (hasVisibleChildren())
{
LLUIImage* arrow_image = default_params.folder_arrow_image;
gl_draw_scaled_rotated_image(
@@ -1077,7 +1095,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
getRoot()->getFolderViewModel()->sort(this);
LL_RECORD_BLOCK_TIME(FTM_ARRANGE);
-
+
// evaluate mHasVisibleChildren
mHasVisibleChildren = false;
if (getViewModelItem()->descendantsPassedFilter())
@@ -1088,7 +1106,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
for (items_t::iterator iit = mItems.begin(); iit != mItems.end(); ++iit)
{
LLFolderViewItem* itemp = (*iit);
- found = itemp->passedFilter();
+ found = itemp->isPotentiallyVisible();
if (found)
break;
}
@@ -1098,7 +1116,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
for (folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
{
LLFolderViewFolder* folderp = (*fit);
- found = folderp->passedFilter();
+ found = folderp->isPotentiallyVisible();
if (found)
break;
}
@@ -1131,7 +1149,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
for(folders_t::iterator fit = mFolders.begin(); fit != mFolders.end(); ++fit)
{
LLFolderViewFolder* folderp = (*fit);
- folderp->setVisible(folderp->passedFilter()); // passed filter or has descendants that passed filter
+ folderp->setVisible(folderp->isPotentiallyVisible());
if (folderp->getVisible())
{
@@ -1150,7 +1168,7 @@ S32 LLFolderViewFolder::arrange( S32* width, S32* height )
iit != mItems.end(); ++iit)
{
LLFolderViewItem* itemp = (*iit);
- itemp->setVisible(itemp->passedFilter());
+ itemp->setVisible(itemp->isPotentiallyVisible());
if (itemp->getVisible())
{
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index af835054db..4f3f26934f 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -263,6 +263,7 @@ public:
S32 getIndentation() { return mIndentation; }
virtual BOOL passedFilter(S32 filter_generation = -1);
+ virtual BOOL isPotentiallyVisible(S32 filter_generation = -1);
// refresh information from the object being viewed.
virtual void refresh();
diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp
index 0f2d2fbee9..3531c2cf50 100755
--- a/indra/llui/lllayoutstack.cpp
+++ b/indra/llui/lllayoutstack.cpp
@@ -49,8 +49,7 @@ LLLayoutPanel::Params::Params()
: expanded_min_dim("expanded_min_dim", 0),
min_dim("min_dim", -1),
user_resize("user_resize", false),
- auto_resize("auto_resize", true),
- force_resize_bar("force_resize_bar", false) // FIRE-5141: Add option to force display of a resize handle
+ auto_resize("auto_resize", true)
{
addSynonym(min_dim, "min_width");
addSynonym(min_dim, "min_height");
@@ -69,8 +68,7 @@ LLLayoutPanel::LLLayoutPanel(const Params& p)
mFractionalSize(0.f),
mTargetDim(0),
mIgnoreReshape(false),
- mOrientation(LLLayoutStack::HORIZONTAL),
- mForceResizeBar(p.force_resize_bar) // FIRE-5141: Add option to force display of a resize handle
+ mOrientation(LLLayoutStack::HORIZONTAL)
{
// panels initialized as hidden should not start out partially visible
if (!getVisible())
@@ -476,10 +474,7 @@ void LLLayoutStack::updateLayout()
if (panelp->mAutoResize
&& !panelp->mCollapsed
- // FIRE-5141: Add option to force display of a resize handle
- //&& panelp->getVisible())
- && (panelp->getVisible() || panelp->mForceResizeBar))
- //
+ && panelp->getVisible())
{
S32 space_for_panel = remaining_space > 0 ? 1 : -1;
panelp->mTargetDim += space_for_panel;
@@ -792,10 +787,7 @@ bool LLLayoutStack::animatePanels()
//
BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
{
- // FIRE-5141: Add option to force display of a resize handle
- //if (panelp->getVisible())
- if (panelp->getVisible() || panelp->mForceResizeBar)
- //
+ if (panelp->getVisible())
{
if (mAnimate && panelp->mVisibleAmt < 1.f)
{
@@ -896,10 +888,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
if (panelp->mAutoResize)
{
old_auto_resize_headroom += (F32)(panelp->mTargetDim - panelp->getRelevantMinDim());
- // FIRE-5141: Add option to force display of a resize handle
- //if (panelp->getVisible() && !panelp->mCollapsed)
- if ((panelp->getVisible() || panelp->mForceResizeBar) && !panelp->mCollapsed)
- //
+ if (panelp->getVisible() && !panelp->mCollapsed)
{
total_visible_fraction += panelp->mFractionalSize;
}
@@ -910,10 +899,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
other_resize_panel = following_panel;
}
- // FIRE-5141: Add option to force display of a resize handle
- //if (panelp->getVisible() && !panelp->mCollapsed)
- if ((panelp->getVisible() || panelp->mForceResizeBar) && !panelp->mCollapsed)
- //
+ if (panelp->getVisible() && !panelp->mCollapsed)
{
following_panel = panelp;
}
@@ -948,10 +934,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
BOOST_FOREACH(LLLayoutPanel* panelp, mPanels)
{
- // FIRE-5141: Add option to force display of a resize handle
- //if (!panelp->getVisible() || panelp->mCollapsed)
- if ((!panelp->getVisible() && !panelp->mForceResizeBar) || panelp->mCollapsed)
- //
+ if (!panelp->getVisible() || panelp->mCollapsed)
{
if (panelp->mAutoResize)
{
@@ -1059,10 +1042,7 @@ void LLLayoutStack::updateResizeBarLimits()
LLLayoutPanel* previous_visible_panelp = NULL;
BOOST_REVERSE_FOREACH(LLLayoutPanel* visible_panelp, mPanels)
{
- // FIRE-5141: Add option to force display of a resize handle
- //if (!visible_panelp->getVisible() || visible_panelp->mCollapsed)
- if ((!visible_panelp->getVisible() && !visible_panelp->mForceResizeBar) || visible_panelp->mCollapsed)
- //
+ if (!visible_panelp->getVisible() || visible_panelp->mCollapsed)
{
visible_panelp->mResizeBar->setVisible(FALSE);
continue;
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index bc61a3cd65..316d05834d 100755
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -151,9 +151,6 @@ public:
Optional user_resize,
auto_resize;
- // FIRE-5141: Add option to force display of a resize handle
- Optional force_resize_bar;
-
Params();
};
@@ -223,9 +220,6 @@ protected:
LLView::EOrientation mOrientation;
class LLResizeBar* mResizeBar;
- // FIRE-5141: Add option to force display of a resize handle
- bool mForceResizeBar;
-
// Add callback for reshaping
reshape_panel_callback_t mReshapePanelCallback;
};
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index 421cdbbf2f..a0524ccc55 100755
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -934,6 +934,34 @@ void LLLineEditor::removeChar()
}
}
+// Ctrl-Backspace remove word
+// Remove a word (set of characters up to next space/punctuation) from the text
+void LLLineEditor::removeWord(bool prev)
+{
+ const U32 pos(getCursor());
+ if (prev ? pos > 0 : static_cast(pos) < getLength())
+ {
+ U32 new_pos(prev ? prevWordPos(pos) : nextWordPos(pos));
+ if (new_pos == pos) // Other character we don't jump over
+ new_pos = prev ? prevWordPos(new_pos-1) : nextWordPos(new_pos+1);
+
+ const U32 diff(labs(pos - new_pos));
+ if (prev)
+ {
+ mText.erase(new_pos, diff);
+ setCursor(new_pos);
+ }
+ else
+ {
+ mText.erase(pos, diff);
+ }
+ }
+ else
+ {
+ LLUI::reportBadKeystroke();
+ }
+}
+//
void LLLineEditor::addChar(const llwchar uni_char)
{
@@ -1382,7 +1410,13 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
else
if( 0 < getCursor() )
{
- removeChar();
+ // Ctrl-Backspace remove word
+ //removeChar();
+ if (mask == MASK_CONTROL)
+ removeWord(true);
+ else
+ removeChar();
+ //
}
else
{
@@ -1392,6 +1426,16 @@ BOOL LLLineEditor::handleSpecialKey(KEY key, MASK mask)
handled = TRUE;
break;
+ // Ctrl-Backspace remove word
+ case KEY_DELETE:
+ if (!mReadOnly && mask == MASK_CONTROL)
+ {
+ removeWord(false);
+ handled = true;
+ }
+ break;
+ //
+
case KEY_PAGE_UP:
case KEY_HOME:
if (!mIgnoreArrowKeys)
diff --git a/indra/llui/lllineeditor.h b/indra/llui/lllineeditor.h
index 1ab5d25346..0b1d593219 100755
--- a/indra/llui/lllineeditor.h
+++ b/indra/llui/lllineeditor.h
@@ -285,6 +285,8 @@ private:
void pasteHelper(bool is_primary);
void removeChar();
+ // Ctrl-Backspace remove word
+ void removeWord(bool prev);
void addChar(const llwchar c);
void setCursorAtLocalPos(S32 local_mouse_x);
S32 findPixelNearestPos(S32 cursor_offset = 0) const;
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index 353c30996c..d45591c838 100755
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -1318,6 +1318,13 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const std::string& target, BOOL case_s
// Selects first enabled item that has a name where the name's first part matched the target string.
// Returns false if item not found.
BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sensitive)
+// Allow selection by substring match
+{
+ return selectItemByStringMatch(target, true, case_sensitive);
+}
+
+BOOL LLScrollListCtrl::selectItemByStringMatch(const LLWString& target, bool prefix_match, BOOL case_sensitive)
+//
{
BOOL found = FALSE;
@@ -1369,7 +1376,18 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
LLWString trimmed_label = item_label;
LLWStringUtil::trim(trimmed_label);
- BOOL select = item->getEnabled() && trimmed_label.compare(0, target_trimmed.size(), target_trimmed) == 0;
+ // Allow selection by substring match
+ //BOOL select = item->getEnabled() && trimmed_label.compare(0, target_trimmed.size(), target_trimmed) == 0;
+ BOOL select;
+ if (prefix_match)
+ {
+ select = item->getEnabled() && trimmed_label.compare(0, target_trimmed.size(), target_trimmed) == 0;
+ }
+ else
+ {
+ select = item->getEnabled() && trimmed_label.find(target_trimmed) != std::string::npos;
+ }
+ //
if (select)
{
@@ -1391,6 +1409,19 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
return found;
}
+// Allow selection by substring match
+BOOL LLScrollListCtrl::selectItemBySubstring(const std::string& target, BOOL case_sensitive)
+{
+ return selectItemBySubstring(utf8str_to_wstring(target), case_sensitive);
+}
+
+// Returns false if item not found.
+BOOL LLScrollListCtrl::selectItemBySubstring(const LLWString& target, BOOL case_sensitive)
+{
+ return selectItemByStringMatch(target, false, case_sensitive);
+}
+//
+
const std::string LLScrollListCtrl::getSelectedItemLabel(S32 column) const
{
LLScrollListItem* item;
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index f6e9e7c947..9aa5e5380f 100755
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -249,6 +249,11 @@ public:
BOOL selectItemByLabel( const std::string& item, BOOL case_sensitive = TRUE, S32 column = 0 ); // FALSE if item not found
BOOL selectItemByPrefix(const std::string& target, BOOL case_sensitive = TRUE);
BOOL selectItemByPrefix(const LLWString& target, BOOL case_sensitive = TRUE);
+ // Allow selection by substring match
+ BOOL selectItemBySubstring(const std::string& target, BOOL case_sensitive = TRUE);
+ BOOL selectItemBySubstring(const LLWString& target, BOOL case_sensitive = TRUE);
+ BOOL selectItemByStringMatch(const LLWString& target, bool prefix_match, BOOL case_sensitive = TRUE);
+ //
LLScrollListItem* getItemByLabel( const std::string& item, BOOL case_sensitive = TRUE, S32 column = 0 );
const std::string getSelectedItemLabel(S32 column = 0) const;
LLSD getSelectedValue();
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 2fb3a0601e..6562c091c0 100755
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -302,6 +302,9 @@ LLTextBase::~LLTextBase()
{
mSegments.clear();
delete mURLClickSignal;
+ // Properly free the signals
+ delete mIsFriendSignal;
+ //
}
void LLTextBase::initFromParams(const LLTextBase::Params& p)
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 5c3b0fe383..85a89dad84 100755
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -264,7 +264,8 @@ LLTextEditor::LLTextEditor(const LLTextEditor::Params& p) :
mContextMenu(NULL),
mShowContextMenu(p.show_context_menu),
mEnableTooltipPaste(p.enable_tooltip_paste),
- mPassDelete(FALSE)
+ mPassDelete(FALSE),
+ mKeepSelectionOnReturn(false)
{
mSourceID.generate();
@@ -1122,6 +1123,35 @@ void LLTextEditor::removeChar()
}
}
+// Ctrl-Backspace remove word
+// Remove a word (set of characters up to next space/punctuation) from the text
+void LLTextEditor::removeWord(bool prev)
+{
+ const U32 pos(mCursorPos);
+ if (prev ? pos > 0 : static_cast(pos) < getLength())
+ {
+ U32 new_pos(prev ? prevWordPos(pos) : nextWordPos(pos));
+ if (new_pos == pos) // Other character we don't jump over
+ new_pos = prev ? prevWordPos(new_pos-1) : nextWordPos(new_pos+1);
+
+ const U32 diff(labs(pos - new_pos));
+ if (prev)
+ {
+ remove(new_pos, diff, false);
+ setCursorPos(new_pos);
+ }
+ else
+ {
+ remove(pos, diff, false);
+ }
+ }
+ else
+ {
+ LLUI::reportBadKeystroke();
+ }
+}
+//
+
// Add a single character to the text
S32 LLTextEditor::addChar(S32 pos, llwchar wc)
{
@@ -1717,7 +1747,13 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask)
else
if( 0 < mCursorPos )
{
- removeCharOrTab();
+ // Ctrl-Backspace remove word
+ //removeCharOrTab();
+ if (mask == MASK_CONTROL)
+ removeWord(true);
+ else
+ removeCharOrTab();
+ //
}
else
{
@@ -1725,11 +1761,23 @@ BOOL LLTextEditor::handleSpecialKey(const KEY key, const MASK mask)
}
break;
+ // Ctrl-Backspace remove word
+ case KEY_DELETE:
+ if (getEnabled() && mask == MASK_CONTROL)
+ {
+ removeWord(false);
+ }
+ else
+ {
+ handled = false;
+ }
+ break;
+ //
case KEY_RETURN:
if (mask == MASK_NONE)
{
- if( hasSelection() )
+ if( hasSelection() && !mKeepSelectionOnReturn )
{
deleteSelection(FALSE);
}
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index d0d3b1e404..bbc3db5b5e 100755
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -262,6 +262,8 @@ protected:
S32 overwriteChar(S32 pos, llwchar wc);
void removeChar();
S32 removeChar(S32 pos);
+ // Ctrl-Backspace remove word
+ void removeWord(bool prev);
S32 insert(S32 pos, const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment);
S32 remove(S32 pos, S32 length, bool group_with_next_op);
@@ -303,6 +305,7 @@ protected:
/*virtual*/ void updateSegments();
void updateLinkSegments();
+ void keepSelectionOnReturn(bool keep) { mKeepSelectionOnReturn = keep; }
private:
//
@@ -346,6 +349,7 @@ private:
bool mParseOnTheFly;
bool mEnableTooltipPaste;
bool mPassDelete;
+ bool mKeepSelectionOnReturn; // disabling of removing selected text after pressing of Enter
LLUUID mSourceID;
diff --git a/indra/llui/lltooltip.cpp b/indra/llui/lltooltip.cpp
index 5e1f12996e..bb7f615d51 100755
--- a/indra/llui/lltooltip.cpp
+++ b/indra/llui/lltooltip.cpp
@@ -476,9 +476,9 @@ void LLToolTipMgr::show(const std::string& msg)
void LLToolTipMgr::show(const LLToolTip::Params& params)
{
- if (!params.styled_message.isProvided()
- && (!params.message.isProvided() || params.message().empty())) return;
-
+ if (!params.styled_message.isProvided()
+ && (!params.message.isProvided() || params.message().empty())
+ && !params.image.isProvided()) return;
// fill in default tooltip params from tool_tip.xml
LLToolTip::Params params_with_defaults(params);
params_with_defaults.fillFrom(LLUICtrlFactory::instance().getDefaultParams());
diff --git a/indra/llui/llurlaction.cpp b/indra/llui/llurlaction.cpp
index 1b08067cbf..85a700d736 100755
--- a/indra/llui/llurlaction.cpp
+++ b/indra/llui/llurlaction.cpp
@@ -227,7 +227,10 @@ void LLUrlAction::blockObject(std::string url)
std::string object_name = getObjectName(url);
if (LLUUID::validate(object_id))
{
- executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + object_name);
+ // FIRE-14987: Cannot mute objects with slashes in their name via V1 chat history
+ //executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + object_name);
+ executeSLURL("secondlife:///app/agent/" + object_id + "/block/" + LLURI::escape(object_name));
+ //
}
}
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 9f2bcacbf5..6d4ca3dc78 100755
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -238,7 +238,10 @@ void callFocus()
void callFocusLost()
{
- gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation);
+ if (gWindowImplementation)
+ {
+ gWindowImplementation->getCallbacks()->handleFocusLost(gWindowImplementation);
+ }
}
void callRightMouseDown(float *pos, MASK mask)
diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt
index 0c1c3d800e..1aa70d4e3b 100755
--- a/indra/media_plugins/webkit/CMakeLists.txt
+++ b/indra/media_plugins/webkit/CMakeLists.txt
@@ -121,12 +121,12 @@ if (DARWIN)
)
# copy the webkit dylib to the build directory
- add_custom_command(
- TARGET media_plugin_webkit POST_BUILD
-# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
- COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
- DEPENDS media_plugin_webkit ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
- )
+# add_custom_command(
+# TARGET media_plugin_webkit POST_BUILD
+# # OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
+# COMMAND ${CMAKE_COMMAND} -E copy ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+# DEPENDS media_plugin_webkit ${ARCH_PREBUILT_DIRS_RELEASE}/libllqtwebkit.dylib
+# )
endif (DARWIN)
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp
index 26d21766ee..26b8a6794d 100755
--- a/indra/media_plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp
@@ -160,7 +160,10 @@ private:
checkEditState();
- if(mInitState == INIT_STATE_NAVIGATE_COMPLETE)
+ // FIRE-14935; Make sure to load URI even if state changes are happing rapidly
+ // if(mInitState == INIT_STATE_NAVIGATE_COMPLETE)
+ if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
+ //
{
if(!mInitialNavigateURL.empty())
{
@@ -458,7 +461,10 @@ private:
// virtual
void onNavigateBegin(const EventType& event)
{
- if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
+ // FIRE-14935; Do not switch URI if there is still a saved URI to load
+ // if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE)
+ if(mInitState >= INIT_STATE_NAVIGATE_COMPLETE && !mInitialNavigateURL.empty() )
+ //
{
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_begin");
message.setValue("uri", event.getEventUri());
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 3a2241dd73..1aececf0da 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -208,6 +208,7 @@ set(viewer_SOURCE_FILES
lggcontactsets.cpp
lfsimfeaturehandler.cpp
llpanelopenregionsettings.cpp
+ fsfloatervramusage.cpp
llaccountingcostmanager.cpp
llaisapi.cpp
@@ -342,6 +343,7 @@ set(viewer_SOURCE_FILES
llfloatergesture.cpp
llfloatergodtools.cpp
llfloatergotoline.cpp
+ llfloatergroupbulkban.cpp
llfloatergroupinvite.cpp
llfloatergroups.cpp
llfloaterhandler.cpp
@@ -516,6 +518,8 @@ set(viewer_SOURCE_FILES
llpanelface.cpp
llpanelgenerictip.cpp
llpanelgroup.cpp
+ llpanelgroupbulk.cpp
+ llpanelgroupbulkban.cpp
llpanelgroupgeneral.cpp
llpanelgroupinvite.cpp
llpanelgrouplandmoney.cpp
@@ -924,6 +928,7 @@ set(viewer_HEADER_FILES
lggbeamscolors.h
lggcontactsets.h
lfsimfeaturehandler.h
+ fsfloatervramusage.h
llaccountingcostmanager.h
llaisapi.h
@@ -1059,6 +1064,7 @@ set(viewer_HEADER_FILES
llfloatergesture.h
llfloatergodtools.h
llfloatergotoline.h
+ llfloatergroupbulkban.h
llfloatergroupinvite.h
llfloatergroups.h
llfloaterhandler.h
@@ -1226,6 +1232,9 @@ set(viewer_HEADER_FILES
llpanelface.h
llpanelgenerictip.h
llpanelgroup.h
+ llpanelgroupbulk.h
+ llpanelgroupbulkimpl.h
+ llpanelgroupbulkban.h
llpanelgroupgeneral.h
llpanelgroupinvite.h
llpanelgrouplandmoney.h
diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp
index d083d1226c..eb2e9f792a 100644
--- a/indra/newview/NACLantispam.cpp
+++ b/indra/newview/NACLantispam.cpp
@@ -470,7 +470,7 @@ bool NACLAntiSpamRegistry::checkNewlineFlood(EAntispamQueue queue, const LLUUID&
}
return false;
}
- return false;
+ return true;
}
bool NACLAntiSpamRegistry::isBlockedOnQueue(EAntispamQueue queue, const LLUUID& source)
@@ -656,8 +656,11 @@ void NACLAntiSpamRegistry::processObjectPropertiesFamily(LLMessageSystem* msg)
{
AntispamObjectData data = found->second;
- data.mName = LLSLURL("objectim", id, "").getSLURLString() + "?name=" + LLURI::escape(name) + "&owner=" + owner_id.asString();
- notify(data);
+ if (!isBlockedOnQueue(data.mQueue, owner_id))
+ {
+ data.mName = LLSLURL("objectim", id, "").getSLURLString() + "?name=" + LLURI::escape(name) + "&owner=" + owner_id.asString();
+ notify(data);
+ }
mObjectData.erase(found);
}
diff --git a/indra/newview/NACLfloaterexploresounds.cpp b/indra/newview/NACLfloaterexploresounds.cpp
index 7c9026ab28..7ae9bf9ee7 100644
--- a/indra/newview/NACLfloaterexploresounds.cpp
+++ b/indra/newview/NACLfloaterexploresounds.cpp
@@ -88,7 +88,7 @@ BOOL NACLFloaterExploreSounds::postBuild()
void NACLFloaterExploreSounds::handleSelection()
{
- S32 num_selected = mHistoryScroller->getAllSelected().size();
+ size_t num_selected = mHistoryScroller->getAllSelected().size();
bool multiple = (num_selected > 1);
childSetEnabled("look_at_btn", (num_selected && !multiple));
childSetEnabled("play_locally_btn", num_selected);
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index d3acad0593..f6cdf40983 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-4.6.8
+4.7.0
diff --git a/indra/newview/animationexplorer.cpp b/indra/newview/animationexplorer.cpp
index f62b206580..6d41d59249 100644
--- a/indra/newview/animationexplorer.cpp
+++ b/indra/newview/animationexplorer.cpp
@@ -70,43 +70,43 @@ void RecentAnimationList::addAnimation(const LLUUID& id, const LLUUID& playedBy)
{
AnimationEntry entry;
- entry.animationID=id;
- entry.playedBy=playedBy;
- entry.time=LLTimer::getElapsedSeconds();
+ entry.animationID = id;
+ entry.playedBy = playedBy;
+ entry.time = LLTimer::getElapsedSeconds();
- AnimationExplorer* explorer=LLFloaterReg::findTypedInstance("animation_explorer");
+ AnimationExplorer* explorer = LLFloaterReg::findTypedInstance("animation_explorer");
// only remember animation when it wasn't played by ourselves or the explorer window is open,
// so the list doesn't get polluted
- if(playedBy!=gAgentAvatarp->getID() || explorer!=NULL)
+ if (playedBy != gAgentAvatarp->getID() || explorer != NULL)
{
mAnimationList.push_back(entry);
// only keep a certain number of entries
- if(mAnimationList.size()>MAX_ANIMATIONS)
+ if (mAnimationList.size() > MAX_ANIMATIONS)
{
mAnimationList.pop_front();
}
}
// if the animation explorer floater is open, send this animation over immediately
- if(explorer)
+ if (explorer)
{
- explorer->addAnimation(id,playedBy,LLTimer::getElapsedSeconds());
+ explorer->addAnimation(id, playedBy, LLTimer::getElapsedSeconds());
}
}
void RecentAnimationList::requestList(AnimationExplorer* explorer)
{
- if(explorer)
+ if (explorer)
{
// send the list of recent animations to the given animation explorer floater
- for(std::deque::iterator iter=mAnimationList.begin();
- iter!=mAnimationList.end();
+ for (std::deque::iterator iter = mAnimationList.begin();
+ iter != mAnimationList.end();
++iter)
{
- AnimationEntry entry=*iter;
- explorer->addAnimation(entry.animationID,entry.playedBy,entry.time);
+ AnimationEntry entry = *iter;
+ explorer->addAnimation(entry.animationID, entry.playedBy, entry.time);
}
}
}
@@ -123,45 +123,45 @@ AnimationExplorer::AnimationExplorer(const LLSD& key)
AnimationExplorer::~AnimationExplorer()
{
- mAnimationPreview=NULL;
+ mAnimationPreview = NULL;
}
void AnimationExplorer::startMotion(const LLUUID& motionID)
{
- if(!mAnimationPreview)
+ if (!mAnimationPreview)
{
return;
}
- LLVOAvatar* avatarp=mAnimationPreview->getDummyAvatar();
+ LLVOAvatar* avatarp = mAnimationPreview->getDummyAvatar();
avatarp->deactivateAllMotions();
- avatarp->startMotion(ANIM_AGENT_STAND,0.0f);
+ avatarp->startMotion(ANIM_AGENT_STAND, 0.0f);
- if(motionID.notNull())
+ if (motionID.notNull())
{
- avatarp->startMotion(motionID,0.0f);
+ avatarp->startMotion(motionID, 0.0f);
}
}
BOOL AnimationExplorer::postBuild()
{
- mAnimationScrollList=getChild("animation_list");
- mStopButton=getChild("stop_btn");
- mRevokeButton=getChild("revoke_btn");
- mStopAndRevokeButton=getChild("stop_and_revoke_btn");
- mNoOwnedAnimationsCheckBox=getChild("no_owned_animations_check");
+ mAnimationScrollList = getChild("animation_list");
+ mStopButton = getChild("stop_btn");
+ mRevokeButton = getChild("revoke_btn");
+ mStopAndRevokeButton = getChild("stop_and_revoke_btn");
+ mNoOwnedAnimationsCheckBox = getChild("no_owned_animations_check");
- mAnimationScrollList->setCommitCallback(boost::bind(&AnimationExplorer::onSelectAnimation,this));
- mStopButton->setCommitCallback(boost::bind(&AnimationExplorer::onStopPressed,this));
- mRevokeButton->setCommitCallback(boost::bind(&AnimationExplorer::onRevokePressed,this));
- mStopAndRevokeButton->setCommitCallback(boost::bind(&AnimationExplorer::onStopAndRevokePressed,this));
- mNoOwnedAnimationsCheckBox->setCommitCallback(boost::bind(&AnimationExplorer::onOwnedCheckToggled,this));
+ mAnimationScrollList->setCommitCallback(boost::bind(&AnimationExplorer::onSelectAnimation, this));
+ mStopButton->setCommitCallback(boost::bind(&AnimationExplorer::onStopPressed, this));
+ mRevokeButton->setCommitCallback(boost::bind(&AnimationExplorer::onRevokePressed, this));
+ mStopAndRevokeButton->setCommitCallback(boost::bind(&AnimationExplorer::onStopAndRevokePressed, this));
+ mNoOwnedAnimationsCheckBox->setCommitCallback(boost::bind(&AnimationExplorer::onOwnedCheckToggled, this));
- mPreviewCtrl=findChild("animation_preview");
- if(mPreviewCtrl)
+ mPreviewCtrl = findChild("animation_preview");
+ if (mPreviewCtrl)
{
- mAnimationPreview=new LLPreviewAnimation(
+ mAnimationPreview = new LLPreviewAnimation(
mPreviewCtrl->getRect().getWidth(),mPreviewCtrl->getRect().getHeight()
);
mAnimationPreview->setZoom(2.0f);
@@ -180,37 +180,37 @@ BOOL AnimationExplorer::postBuild()
void AnimationExplorer::onSelectAnimation()
{
- LLScrollListItem* item=mAnimationScrollList->getFirstSelected();
- if(!item)
+ LLScrollListItem* item = mAnimationScrollList->getFirstSelected();
+ if (!item)
{
return;
}
- S32 column=mAnimationScrollList->getColumn("animation_id")->mIndex;
- mCurrentAnimationID=item->getColumn(column)->getValue().asUUID();
+ S32 column = mAnimationScrollList->getColumn("animation_id")->mIndex;
+ mCurrentAnimationID = item->getColumn(column)->getValue().asUUID();
- column=mAnimationScrollList->getColumn("played_by")->mIndex;
- mCurrentObject=item->getColumn(column)->getValue().asUUID();
+ column = mAnimationScrollList->getColumn("played_by")->mIndex;
+ mCurrentObject = item->getColumn(column)->getValue().asUUID();
startMotion(mCurrentAnimationID);
}
void AnimationExplorer::onStopPressed()
{
- if(mCurrentAnimationID.notNull())
+ if (mCurrentAnimationID.notNull())
{
gAgentAvatarp->stopMotion(mCurrentAnimationID);
- gAgent.sendAnimationRequest(mCurrentAnimationID,ANIM_REQUEST_STOP);
+ gAgent.sendAnimationRequest(mCurrentAnimationID, ANIM_REQUEST_STOP);
}
}
void AnimationExplorer::onRevokePressed()
{
- if(mCurrentObject.notNull())
+ if (mCurrentObject.notNull())
{
- LLViewerObject* vo=gObjectList.findObject(mCurrentObject);
+ LLViewerObject* vo = gObjectList.findObject(mCurrentObject);
- if(vo)
+ if (vo)
{
gAgentAvatarp->revokePermissionsOnObject(vo);
}
@@ -232,35 +232,35 @@ void AnimationExplorer::onOwnedCheckToggled()
void AnimationExplorer::draw()
{
LLFloater::draw();
- LLRect r=mPreviewCtrl->getRect();
+ LLRect r = mPreviewCtrl->getRect();
- if(mAnimationPreview)
+ if (mAnimationPreview)
{
mAnimationPreview->requestUpdate();
- gGL.color3f(1.0f,1.0f,1.0f);
+ gGL.color3f(1.0f, 1.0f, 1.0f);
gGL.getTexUnit(0)->bind(mAnimationPreview);
gGL.begin(LLRender::QUADS);
{
- gGL.texCoord2f(0.0f,1.0f);
- gGL.vertex2i(r.mLeft,r.mTop);
- gGL.texCoord2f(0.0f,0.0f);
- gGL.vertex2i(r.mLeft,r.mBottom);
- gGL.texCoord2f(1.0f,0.0f);
- gGL.vertex2i(r.mRight,r.mBottom);
- gGL.texCoord2f(1.0f,1.0f);
- gGL.vertex2i(r.mRight,r.mTop);
+ gGL.texCoord2f(0.0f, 1.0f);
+ gGL.vertex2i(r.mLeft, r.mTop);
+ gGL.texCoord2f(0.0f, 0.0f);
+ gGL.vertex2i(r.mLeft, r.mBottom);
+ gGL.texCoord2f(1.0f, 0.0f);
+ gGL.vertex2i(r.mRight, r.mBottom);
+ gGL.texCoord2f(1.0f, 1.0f);
+ gGL.vertex2i(r.mRight, r.mTop);
}
gGL.end();
gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
}
// update tiems and "Still playing" status in the list once every few seconds
- static F64 last_update=0.0f;
- F64 time=LLTimer::getElapsedSeconds();
- if(time-last_update>5.0f)
+ static F64 last_update = 0.0f;
+ F64 time = LLTimer::getElapsedSeconds();
+ if (time-last_update > 5.0f)
{
- last_update=time;
+ last_update = time;
updateList(time);
}
}
@@ -276,58 +276,58 @@ void AnimationExplorer::update()
void AnimationExplorer::updateList(F64 current_timestamp)
{
- S32 played_column=mAnimationScrollList->getColumn("played")->mIndex;
- S32 timestamp_column=mAnimationScrollList->getColumn("timestamp")->mIndex;
- S32 object_id_column=mAnimationScrollList->getColumn("object_id")->mIndex;
- S32 anim_id_column=mAnimationScrollList->getColumn("animation_id")->mIndex;
+ S32 played_column = mAnimationScrollList->getColumn("played")->mIndex;
+ S32 timestamp_column = mAnimationScrollList->getColumn("timestamp")->mIndex;
+ S32 object_id_column = mAnimationScrollList->getColumn("object_id")->mIndex;
+ S32 anim_id_column = mAnimationScrollList->getColumn("animation_id")->mIndex;
// go through the full animation scroll list
- std::vector items=mAnimationScrollList->getAllData();
- for (std::vector::iterator list_iter=items.begin();list_iter!=items.end();++list_iter)
+ std::vector items = mAnimationScrollList->getAllData();
+ for (std::vector::iterator list_iter = items.begin(); list_iter != items.end(); ++list_iter)
{
- LLScrollListItem* item=*list_iter;
+ LLScrollListItem* item = *list_iter;
// get a pointer to the "Played" column text
- LLScrollListText* played_text=(LLScrollListText*) item->getColumn(played_column);
+ LLScrollListText* played_text = (LLScrollListText*)item->getColumn(played_column);
// get the object ID from the list
- LLUUID object_id=item->getColumn(object_id_column)->getValue().asUUID();
+ LLUUID object_id = item->getColumn(object_id_column)->getValue().asUUID();
// assume this animation is not running first
- bool is_running=false;
+ bool is_running = false;
// go through the list of playing animations to find out if this animation played by
// this object is still running
- for(LLVOAvatar::AnimSourceIterator anim_iter=gAgentAvatarp->mAnimationSources.begin();
- anim_iter!=gAgentAvatarp->mAnimationSources.end();anim_iter++)
+ for (LLVOAvatar::AnimSourceIterator anim_iter = gAgentAvatarp->mAnimationSources.begin();
+ anim_iter != gAgentAvatarp->mAnimationSources.end(); ++anim_iter)
{
// object found
- if(anim_iter->first==object_id)
+ if (anim_iter->first == object_id)
{
- LLUUID anim_id=item->getColumn(anim_id_column)->getValue().asUUID();
+ LLUUID anim_id = item->getColumn(anim_id_column)->getValue().asUUID();
// animation found
- if(anim_iter->second==anim_id)
+ if (anim_iter->second == anim_id)
{
// set text to "Still playing" and break out of this loop
played_text->setText(LLTrans::getString("animation_explorer_still_playing"));
- is_running=true;
+ is_running = true;
break;
}
}
}
// animation was not found to be running
- if(!is_running)
+ if (!is_running)
{
// get timestamp when this animation was started
- F64 timestamp=item->getColumn(timestamp_column)->getValue().asReal();
+ F64 timestamp = item->getColumn(timestamp_column)->getValue().asReal();
// update text to show the number of seconds ago when this animation was started
LLStringUtil::format_map_t args;
- args["SECONDS"]=llformat("%d",(S32) (current_timestamp-timestamp));
+ args["SECONDS"] = llformat("%d", (S32) (current_timestamp - timestamp));
- played_text->setText(LLTrans::getString("animation_explorer_seconds_ago",args));
+ played_text->setText(LLTrans::getString("animation_explorer_seconds_ago", args));
}
}
}
@@ -335,37 +335,37 @@ void AnimationExplorer::updateList(F64 current_timestamp)
void AnimationExplorer::addAnimation(const LLUUID& id, const LLUUID& played_by, F64 time)
{
// don't add animations that are played by ourselves when the filter box is checked
- if(played_by==gAgentAvatarp->getID())
+ if (played_by == gAgentAvatarp->getID())
{
- if(mNoOwnedAnimationsCheckBox->getValue().asBoolean())
+ if (mNoOwnedAnimationsCheckBox->getValue().asBoolean())
{
return;
}
}
// set object name to UUID at first
- std::string playedByName=played_by.asString();
+ std::string playedByName = played_by.asString();
// find out if the object is still in reach
- LLViewerObject* vo=gObjectList.findObject(played_by);
- if(vo)
+ LLViewerObject* vo = gObjectList.findObject(played_by);
+ if (vo)
{
// if it was an avatar, get the name here
- if(vo->isAvatar())
+ if (vo->isAvatar())
{
- playedByName=std::string(vo->getNVPair("FirstName")->getString())+" "+
+ playedByName = std::string(vo->getNVPair("FirstName")->getString()) + " " +
std::string(vo->getNVPair("LastName")->getString());
}
// not an avatar, do a lookup by UUID
else
{
// find out if we know the name to this UUID already
- std::map::iterator iter=mKnownIDs.find(played_by);
+ std::map::iterator iter = mKnownIDs.find(played_by);
// if we don't know it yet, start a lookup
- if(iter==mKnownIDs.end())
+ if (iter == mKnownIDs.end())
{
// if we are not already looking up this object's name, send a request out
- if(std::find(mRequestedIDs.begin(),mRequestedIDs.end(),played_by)==mRequestedIDs.end())
+ if (std::find(mRequestedIDs.begin(), mRequestedIDs.end(), played_by) == mRequestedIDs.end())
{
// remember which object names we already requested
mRequestedIDs.push_back(played_by);
@@ -374,86 +374,86 @@ void AnimationExplorer::addAnimation(const LLUUID& id, const LLUUID& played_by,
msg->newMessageFast(_PREHASH_ObjectSelect);
msg->nextBlockFast(_PREHASH_AgentData);
- msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
- msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+ msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
msg->nextBlockFast(_PREHASH_ObjectData);
- msg->addU32Fast(_PREHASH_ObjectLocalID,vo->getLocalID());
+ msg->addU32Fast(_PREHASH_ObjectLocalID, vo->getLocalID());
msg->sendReliable(gAgentAvatarp->getRegion()->getHost());
msg->newMessageFast(_PREHASH_ObjectDeselect);
msg->nextBlockFast(_PREHASH_AgentData);
- msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
- msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+ msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+ msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
msg->nextBlockFast(_PREHASH_ObjectData);
- msg->addU32Fast(_PREHASH_ObjectLocalID,vo->getLocalID());
+ msg->addU32Fast(_PREHASH_ObjectLocalID, vo->getLocalID());
msg->sendReliable(gAgentAvatarp->getRegion()->getHost());
}
}
else
{
// we know the name already
- playedByName=mKnownIDs[played_by];
+ playedByName = mKnownIDs[played_by];
}
}
}
// insert the item into the scroll list
LLSD item;
- item["columns"][0]["column"]="played_by";
- item["columns"][0]["value"]=playedByName;
- item["columns"][1]["column"]="played";
- item["columns"][1]["value"]=LLTrans::getString("animation_explorer_still_playing");
- item["columns"][2]["column"]="timestamp";
- item["columns"][2]["value"]=time;
- item["columns"][3]["column"]="animation_id";
- item["columns"][3]["value"]=id;
- item["columns"][4]["column"]="object_id";
- item["columns"][4]["value"]=played_by;
+ item["columns"][0]["column"] = "played_by";
+ item["columns"][0]["value"] = playedByName;
+ item["columns"][1]["column"] = "played";
+ item["columns"][1]["value"] = LLTrans::getString("animation_explorer_still_playing");
+ item["columns"][2]["column"] = "timestamp";
+ item["columns"][2]["value"] = time;
+ item["columns"][3]["column"] = "animation_id";
+ item["columns"][3]["value"] = id;
+ item["columns"][4]["column"] = "object_id";
+ item["columns"][4]["value"] = played_by;
- mAnimationScrollList->addElement(item,ADD_TOP);
+ mAnimationScrollList->addElement(item, ADD_TOP);
}
void AnimationExplorer::requestNameCallback(LLMessageSystem* msg)
{
// if we weren't looking for any IDs, ignore this callback
- if(mRequestedIDs.empty())
+ if (mRequestedIDs.empty())
{
return;
}
// we might have received more than one answer in one block
- S32 num=msg->getNumberOfBlocksFast(_PREHASH_ObjectData);
- for (S32 index=0;indexgetNumberOfBlocksFast(_PREHASH_ObjectData);
+ for (S32 index = 0; index < num; ++index)
{
LLUUID object_id;
- msg->getUUIDFast(_PREHASH_ObjectData,_PREHASH_ObjectID,object_id,index);
+ msg->getUUIDFast(_PREHASH_ObjectData, _PREHASH_ObjectID, object_id, index);
- std::vector::iterator iter;
- iter=std::find(mRequestedIDs.begin(),mRequestedIDs.end(),object_id);
+ uuid_vec_t::iterator iter;
+ iter = std::find(mRequestedIDs.begin(), mRequestedIDs.end(), object_id);
// if this is one of the objects we were looking for, process the data
- if(iter!=mRequestedIDs.end())
+ if (iter != mRequestedIDs.end())
{
// get the name of the object
std::string object_name;
- msg->getStringFast(_PREHASH_ObjectData,_PREHASH_Name,object_name,index);
+ msg->getStringFast(_PREHASH_ObjectData, _PREHASH_Name, object_name, index);
// remove the object from the lookup list and add it to the known names list
mRequestedIDs.erase(iter);
- mKnownIDs[object_id]=object_name;
+ mKnownIDs[object_id] = object_name;
- S32 object_id_column=mAnimationScrollList->getColumn("object_id")->mIndex;
- S32 played_by_column=mAnimationScrollList->getColumn("played_by")->mIndex;
+ S32 object_id_column = mAnimationScrollList->getColumn("object_id")->mIndex;
+ S32 played_by_column = mAnimationScrollList->getColumn("played_by")->mIndex;
// find all scroll list entries with this object UUID and update the names there
- std::vector items=mAnimationScrollList->getAllData();
- for (std::vector::iterator list_iter=items.begin();list_iter!=items.end();++list_iter)
+ std::vector items = mAnimationScrollList->getAllData();
+ for (std::vector::iterator list_iter = items.begin(); list_iter != items.end(); ++list_iter)
{
- LLScrollListItem* item=*list_iter;
- LLUUID list_object_id=item->getColumn(object_id_column)->getValue().asUUID();
+ LLScrollListItem* item = *list_iter;
+ LLUUID list_object_id = item->getColumn(object_id_column)->getValue().asUUID();
- if(object_id==list_object_id)
+ if (object_id == list_object_id)
{
- LLScrollListText* played_by_text=(LLScrollListText*) item->getColumn(played_by_column);
+ LLScrollListText* played_by_text = (LLScrollListText*)item->getColumn(played_by_column);
played_by_text->setText(object_name);
}
}
diff --git a/indra/newview/animationexplorer.h b/indra/newview/animationexplorer.h
index 92f5c25ad1..d0891f587b 100644
--- a/indra/newview/animationexplorer.h
+++ b/indra/newview/animationexplorer.h
@@ -59,7 +59,7 @@ class RecentAnimationList
std::deque mAnimationList;
- void addAnimation(const LLUUID& id,const LLUUID& playedBy); // called in llviewermessage.cpp
+ void addAnimation(const LLUUID& id, const LLUUID& playedBy); // called in llviewermessage.cpp
void requestList(AnimationExplorer* explorer); // request animation list
};
@@ -85,7 +85,7 @@ class AnimationExplorer
public:
/*virtual*/ BOOL postBuild();
- void addAnimation(const LLUUID& id,const LLUUID& playedBy,F64 time); // called from RecentAnimationList
+ void addAnimation(const LLUUID& id, const LLUUID& playedBy, F64 time); // called from RecentAnimationList
// copied from llfloaterbvhpreview.h
BOOL handleMouseDown(S32 x, S32 y, MASK mask);
@@ -113,7 +113,7 @@ class AnimationExplorer
LLUUID mCurrentObject; // object ID that played the currently selected animation
std::vector mRequestedIDs; // list of object IDs we requested named for
- std::map mKnownIDs; // known list of names for object IDs
+ std::map mKnownIDs; // known list of names for object IDs
void draw();
void update(); // request list update from RecentAnimationList
diff --git a/indra/newview/ao.cpp b/indra/newview/ao.cpp
index 5e2ce21785..91cf8b8f30 100644
--- a/indra/newview/ao.cpp
+++ b/indra/newview/ao.cpp
@@ -342,9 +342,13 @@ void FloaterAO::onRenameSet()
std::string name=mSetSelector->getSimple();
LLStringUtil::trim(name);
+ LLUIString new_set_name=name;
+
if(!name.empty())
{
- if(name.find_first_of(":|")==std::string::npos)
+ if(
+ LLTextValidate::validateASCIIPrintableNoPipe(new_set_name.getWString()) && // only allow ASCII
+ name.find_first_of(":|")==std::string::npos) // don't allow : or |
{
if(AOEngine::instance().renameSet(mSelectedSet,name))
{
@@ -356,7 +360,7 @@ void FloaterAO::onRenameSet()
{
LLSD args;
args["AO_SET_NAME"]=name;
- LLNotificationsUtil::add("RenameAOCantContainColon",args);
+ LLNotificationsUtil::add("RenameAOMustBeASCII",args);
}
}
mSetSelector->setSimple(mSelectedSet->getName());
@@ -445,13 +449,19 @@ BOOL FloaterAO::newSetCallback(const LLSD& notification,const LLSD& response)
LLStringUtil::trim(newSetName);
+ LLUIString new_set_name=newSetName;
+
if(newSetName.empty())
+ {
return FALSE;
- else if(newSetName.find_first_of(":|")!=std::string::npos)
+ }
+ else if(
+ !LLTextValidate::validateASCIIPrintableNoPipe(new_set_name.getWString()) || // only allow ASCII
+ newSetName.find_first_of(":|")!=std::string::npos) // don't allow : or |
{
LLSD args;
args["AO_SET_NAME"]=newSetName;
- LLNotificationsUtil::add("NewAOCantContainColon",args);
+ LLNotificationsUtil::add("NewAOCantContainNonASCII",args);
return FALSE;
}
diff --git a/indra/newview/aoengine.cpp b/indra/newview/aoengine.cpp
index aac34ca400..5246e36d30 100644
--- a/indra/newview/aoengine.cpp
+++ b/indra/newview/aoengine.cpp
@@ -1036,6 +1036,13 @@ void AOEngine::update()
{
LLViewerInventoryCategory* currentCategory=categories->at(index);
const std::string& setFolderName=currentCategory->getName();
+
+ if( setFolderName.empty())
+ {
+ LL_WARNS("AOEngine") << "Folder with emtpy name in AO folder" << LL_ENDL;
+ continue;
+ }
+
std::vector params;
LLStringUtil::getTokens(setFolderName,params,":");
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 9d75719c72..3ba6d2ef7b 100755
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -209,7 +209,7 @@
icon="Command_Search_Icon"
label_ref="Command_Search_Label"
tooltip_ref="Command_Search_Tooltip"
- execute_function="Floater.Toggle"
+ execute_function="Floater.ToggleOrBringToFront"
execute_parameters="search"
is_running_function="Floater.IsOpen"
is_running_parameters="search"
diff --git a/indra/newview/app_settings/grids.fallback.xml b/indra/newview/app_settings/grids.fallback.xml
index a6fe8a0183..9de72b2a1e 100644
--- a/indra/newview/app_settings/grids.fallback.xml
+++ b/indra/newview/app_settings/grids.fallback.xml
@@ -1,5 +1,41 @@
diff --git a/indra/newview/app_settings/settings_latency.xml b/indra/newview/app_settings/settings_latency.xml
index 67689cdc57..90facf0e31 100644
--- a/indra/newview/app_settings/settings_latency.xml
+++ b/indra/newview/app_settings/settings_latency.xml
@@ -723,15 +723,29 @@
2
+ FSFlashOnMessage
+
-
-
-
-
-
-
-
-
+ PlayModeUISndScriptFloaterOpen
+
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index cdf3dd8f67..4cfd651064 100755
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -643,6 +643,17 @@
Value
0
+ FSKeywordMatchWholeWords
+
FSKeywords
+ PlayModeUISndScriptFloaterOpen
+
+
FSAnimatedScriptDialogs
}
@@ -1462,6 +1468,11 @@ void FSFloaterIM::processChatHistoryStyleUpdate(const LLSD& newvalue)
{
floater->updateChatHistoryStyle();
floater->mInputEditor->setFont(font);
+
+ // Re-set the current text to make style update instant
+ std::string text = floater->mInputEditor->getText();
+ floater->mInputEditor->clear();
+ floater->mInputEditor->setText(text);
}
}
}
diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 9029910243..3e3df56dad 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -495,6 +495,12 @@ void FSFloaterNearbyChat::processChatHistoryStyleUpdate(const LLSD& newvalue)
if (nearby_chat)
{
nearby_chat->updateChatHistoryStyle();
+ nearby_chat->mInputEditor->setFont(LLViewerChat::getChatFont());
+
+ // Re-set the current text to make style update instant
+ std::string text = nearby_chat->mInputEditor->getText();
+ nearby_chat->mInputEditor->clear();
+ nearby_chat->mInputEditor->setText(text);
}
}
@@ -683,21 +689,21 @@ BOOL FSFloaterNearbyChat::handleKeyHere( KEY key, MASK mask )
if (KEY_RETURN == key)
{
- if (mask == MASK_CONTROL)
+ if (mask == MASK_CONTROL && gSavedSettings.getBOOL("FSUseCtrlShout"))
{
// shout
mInputEditor->updateHistory();
sendChat(CHAT_TYPE_SHOUT);
handled = TRUE;
}
- else if (mask == MASK_SHIFT)
+ else if (mask == MASK_SHIFT && gSavedSettings.getBOOL("FSUseShiftWhisper"))
{
// whisper
mInputEditor->updateHistory();
sendChat(CHAT_TYPE_WHISPER);
handled = TRUE;
}
- else if (mask == MASK_ALT)
+ else if (mask == MASK_ALT && gSavedSettings.getBOOL("FSUseAltOOC"))
{
// OOC
mInputEditor->updateHistory();
@@ -1015,7 +1021,10 @@ void FSFloaterNearbyChat::sendChat( EChatType type )
utf8text = applyMuPose(utf8text);
// discard returned "found" boolean
- LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text);
+ if(!LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text))
+ {
+ utf8_revised_text = utf8text;
+ }
}
else
{
diff --git a/indra/newview/fsfloatervramusage.cpp b/indra/newview/fsfloatervramusage.cpp
new file mode 100644
index 0000000000..3e6d0df0c8
--- /dev/null
+++ b/indra/newview/fsfloatervramusage.cpp
@@ -0,0 +1,343 @@
+/**
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (c) 2015 Nicky Dasmijn
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "fsfloatervramusage.h"
+#include "llscrolllistctrl.h"
+#include "llviewerobjectlist.h"
+#include "lldrawable.h"
+#include "llviewertexture.h"
+#include "lltoolpie.h"
+#include "llfloaterreg.h"
+#include "llface.h"
+#include "llvertexbuffer.h"
+#include "llcallbacklist.h"
+#include "llvoavatarself.h"
+#include "llagentcamera.h"
+
+const F32 PROPERTIES_REQUEST_TIMEOUT = 10.0f;
+const F32 PROPERY_REQUEST_INTERVAL = 2.0f;
+const U32 PROPERTIES_MAX_REQUEST_COUNT = 250;
+
+static void onIdle( void *aData )
+{
+ FSFloaterVRAMUsage *pFloater = reinterpret_cast(aData);
+ pFloater->onIdle();
+}
+
+struct ObjectStat
+{
+ LLUUID mId;
+ U32 mTextureSize;
+};
+
+struct FSFloaterVRAMUsage::ImplData
+{
+ LLScrollListCtrl *mList;
+ LLObjectSelectionHandle mSelection;
+ U32 mPending;
+ LLFrameTimer mPropTimer;
+
+ std::deque< ObjectStat > mObjects;
+};
+
+bool sortByTexture( ObjectStat const &lhs, ObjectStat const &rhs )
+{
+ return lhs.mTextureSize > rhs.mTextureSize;
+}
+
+FSFloaterVRAMUsage::FSFloaterVRAMUsage(const LLSD& seed)
+ : LLFloater( seed )
+{
+ mData = new ImplData();
+ mData->mList = 0;
+ mData->mPending = 0;
+
+ gIdleCallbacks.addFunction( &::onIdle, this) ;
+}
+
+FSFloaterVRAMUsage::~FSFloaterVRAMUsage()
+{
+ gIdleCallbacks.deleteFunction( &::onIdle, this );
+ delete mData;
+ LLSelectMgr::instance().removePropertyListener( this );
+ LLSelectMgr::instance().enableSilhouette( TRUE );
+}
+
+void FSFloaterVRAMUsage::onOpen(const LLSD& key)
+{
+}
+
+BOOL FSFloaterVRAMUsage::postBuild()
+{
+ LLButton *pRefresh = getChild< LLButton >( "refresh_button" );
+ pRefresh->setClickedCallback( boost::bind( &FSFloaterVRAMUsage::doRefresh, this ) );
+
+ mData->mList = getChild< LLScrollListCtrl >( "result_list" );
+
+ LLSelectMgr::instance().registerPropertyListener( this );
+ LLSelectMgr::instance().enableSilhouette( FALSE );
+
+ return TRUE;
+}
+
+void FSFloaterVRAMUsage::onIdle()
+{
+ if( !mData->mPending && mData->mObjects.empty() )
+ {
+ LLSelectMgr::instance().deselectAll();
+ return;
+ }
+
+ if( mData->mPending && mData->mPropTimer.getElapsedTimeF32() < PROPERTIES_REQUEST_TIMEOUT )
+ return;
+
+ if( !mData->mPending && mData->mPropTimer.getStarted() && mData->mPropTimer.getElapsedTimeF32() < PROPERY_REQUEST_INTERVAL )
+ return;
+
+ LLSelectMgr::instance().deselectAll();
+ mData->mPending = 0;
+
+ std::vector< LLViewerObject* > vctSelection;
+ std::deque< ObjectStat > withoutRegion;
+
+ while( mData->mPending < PROPERTIES_MAX_REQUEST_COUNT && !mData->mObjects.empty() )
+ {
+ LLViewerObject *pObj = gObjectList.findObject( mData->mObjects[ 0 ].mId );
+ if( pObj && pObj->getRegion() )
+ {
+ ++mData->mPending;
+ vctSelection.push_back( pObj );
+ }
+ else if( pObj )
+ withoutRegion.push_back( mData->mObjects[0] );
+
+ mData->mObjects.erase( mData->mObjects.begin() );
+ }
+
+ mData->mObjects.insert( mData->mObjects.end(), withoutRegion.begin(), withoutRegion.end() );
+
+ mData->mPropTimer.start();
+ if( vctSelection.size() )
+ {
+ LLSelectMgr::instance().enableBatchMode();
+ mData->mSelection = LLSelectMgr::instance().selectObjectAndFamily( vctSelection );
+ LLSelectMgr::instance().disableBatchMode();
+ }
+}
+
+U32 FSFloaterVRAMUsage::calcTexturSize( LLViewerObject *aObject, std::ostream *aTooltip )
+{
+ if( !aObject || !aObject->mDrawable || aObject->mDrawable->isDead() )
+ return 0;
+
+ std::map< LLUUID, U32 > stTextures;
+
+ F64 totalTexSize = 0;
+ U8 numTEs = aObject->getNumTEs();
+
+ if (aTooltip )
+ *aTooltip << (U32)numTEs << " TEs" << std::endl;
+
+ for( U8 j = 0; j < numTEs; ++j )
+ {
+ LLViewerTexture *pTex = aObject->getTEImage( j );
+ if( !pTex || pTex->isMissingAsset() )
+ continue;
+
+ U32 textureId = stTextures.size();
+ bool bOldTexId( false );
+
+ if( stTextures.end() != stTextures.find( pTex->getID() ) )
+ {
+ textureId = stTextures[ pTex->getID() ];
+ bOldTexId = true;
+ }
+
+ if (aTooltip )
+ *aTooltip << "TE: " << (U32)j << " tx: " << textureId << " w/h/c " << pTex->getFullWidth() << "/" << pTex->getFullHeight() << "/" << (U32)pTex->getComponents() << std::endl;
+
+ if( bOldTexId )
+ continue;
+
+ stTextures[ pTex->getID() ] = textureId;
+
+ S32 texSize = pTex->getFullWidth() * pTex->getFullHeight() * pTex->getComponents();
+ if( pTex->getUseMipMaps() )
+ texSize += (texSize*33)/100;
+
+ totalTexSize += texSize;
+ }
+
+ totalTexSize /= 1024.0;
+ return static_cast< U32 >( totalTexSize );
+}
+
+void FSFloaterVRAMUsage::doRefresh()
+{
+ mData->mList->deleteAllItems();
+ S32 numObjects = gObjectList.getNumObjects();
+
+ mData->mPending = 0;
+ mData->mObjects.clear();
+ LLSelectMgr::instance().deselectAll();
+
+ for( S32 i = 0; i < numObjects; ++i )
+ {
+ LLViewerObject *pObj = gObjectList.getObject( i );
+ if( !pObj ) // Might be dead
+ continue;
+
+ if( !pObj->mbCanSelect ||
+ pObj->getPCode() == LLViewerObject::LL_VO_SURFACE_PATCH ||
+ pObj->getPCode() == LLViewerObject::LL_VO_SKY ||
+ pObj->getPCode() == LLViewerObject::LL_VO_WL_SKY ||
+ pObj->getPCode() == LLViewerObject::LL_VO_VOID_WATER ||
+ pObj->getPCode() == LLViewerObject::LL_VO_WATER ||
+ pObj->isAvatar() )
+ continue;
+
+ // Exclude everything that's not in a sphere with r=draw distance around the avatar.
+ F64 distance = (pObj->getPositionGlobal() - gAgentAvatarp->getPositionGlobal()).length();
+ if( distance > gAgentCamera.mDrawDistance )
+ continue;
+
+ ObjectStat oObject;
+ oObject.mId = pObj->getID();
+ oObject.mTextureSize = calcTexturSize( pObj );
+
+ mData->mObjects.push_back( oObject );
+ }
+ std::sort( mData->mObjects.begin(), mData->mObjects.end(), sortByTexture );
+}
+
+void FSFloaterVRAMUsage::addObjectToList( LLViewerObject *aObject, std::string const &aName )
+{
+ LLScrollListItem::Params item;
+
+ F64 distance = (aObject->getPositionGlobal() - gAgentAvatarp->getPositionGlobal()).length();
+
+ item.columns.add().column("uuid").value( aObject->getID() );
+ item.columns.add().column("name").value( aName );
+ item.columns.add().column("distance").value( distance );
+ item.columns.add().column("faces").value( aObject->getNumFaces() );
+ item.columns.add().column("vertices").value( static_cast( aObject->getNumVertices() ) );
+ item.columns.add().column("indices").value( static_cast( aObject->getNumIndices() ) );
+
+ std::stringstream strTooltip;
+ U32 totalTexSize = calcTexturSize( aObject, &strTooltip );
+
+ F64 totalVboSize(0.0);
+
+ LLPointer< LLDrawable > pDrawable = aObject->mDrawable;
+ S32 numFaces = 0;
+ if( pDrawable && !pDrawable->isDead() )
+ numFaces = pDrawable->getNumFaces();
+
+ strTooltip << numFaces << " faces" << std::endl;
+ for (S32 j = 0; j < numFaces; j++)
+ {
+ LLFace* pFace = pDrawable->getFace( j );
+ if( !pFace )
+ continue;
+
+ S32 cmW = 0, cmH = 0;
+
+ calcFaceSize( pFace, cmW, cmH );
+
+ strTooltip << "Face: " << j << " extends (cm) w/h " << cmW << "/" << cmH << std::endl;
+
+ S32 vertexSize = calcVBOEntrySize( pFace->getVertexBuffer() ) * aObject->getNumVertices();;
+ S32 indexSize = sizeof( S16 ) * aObject->getNumIndices();
+
+ totalVboSize += vertexSize;
+ totalVboSize += indexSize;
+ }
+
+ totalVboSize /= 1024.0;
+
+ item.columns.add().column("vram_usage").value( (S32)totalTexSize );
+ item.columns.add().column("vram_usage_vbo").value( (S32)totalVboSize );
+
+ LLScrollListItem *pRow = mData->mList->addRow( item );
+ if( pRow )
+ {
+ for( S32 j = 0; j < pRow->getNumColumns(); ++j )
+ pRow->getColumn( j )->setToolTip( strTooltip.str() );
+ }
+}
+
+void FSFloaterVRAMUsage::calcFaceSize( LLFace *aFace, S32 &aW, S32 &aH )
+{
+ aW = aH = 0;
+ if( !aFace )
+ return;
+
+ LLVector4a size;
+ size.setSub( aFace->mExtents[1], aFace->mExtents[0] );
+
+ S32 cmX = static_cast( size[0]*100 );
+ S32 cmY = static_cast( size[1]*100 );
+ S32 cmZ = static_cast( size[2]*100 );
+
+ aW = cmX;
+ aH = cmY;
+
+ if( 0 != cmZ )
+ {
+ if( 0 == aW )
+ aW = cmZ;
+ else
+ aH = cmZ;
+ }
+}
+
+S32 FSFloaterVRAMUsage::calcVBOEntrySize( LLVertexBuffer *aVBO )
+{
+ if( !aVBO )
+ return 0;
+
+ S32 vboEntrySize(0);
+
+ U32 vboMask = aVBO->getTypeMask();
+ for( S32 k = 0, l = 1; k < LLVertexBuffer::TYPE_MAX; ++k )
+ {
+ if( vboMask & l && k != LLVertexBuffer::TYPE_TEXTURE_INDEX )
+ vboEntrySize += LLVertexBuffer::sTypeSize[ k ];
+ l = l << 1;
+ }
+
+ return vboEntrySize;
+}
+
+void FSFloaterVRAMUsage::onProperties( LLSelectNode const *aProps )
+{
+ if( !aProps && !aProps->getObject() )
+ return;
+
+ LLUUID id = aProps->getObject()->getID();
+ LLViewerObject *pObj = gObjectList.findObject( id );
+ addObjectToList( pObj, aProps->mName );
+}
diff --git a/indra/newview/fsfloatervramusage.h b/indra/newview/fsfloatervramusage.h
new file mode 100644
index 0000000000..19984dc0cd
--- /dev/null
+++ b/indra/newview/fsfloatervramusage.h
@@ -0,0 +1,61 @@
+/**
+ * $LicenseInfo:firstyear=2015&license=viewerlgpl$
+ * Phoenix Firestorm Viewer Source Code
+ * Copyright (c) 2015 Nicky Dasmijn
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * The Phoenix Firestorm Project, Inc., 1831 Oakwood Drive, Fairmont, Minnesota 56031-3225 USA
+ * http://www.firestormviewer.org
+ * $/LicenseInfo$
+ */
+
+#ifndef FS_FLOATERVRAMUSAGE_H
+#define FS_FLOATERVRAMUSAGE_H
+
+#include "llfloater.h"
+#include "llselectmgr.h"
+
+class LLScrollListCtrl;
+class LLViewerObject;
+class LLFace;
+class LLVertexBuffer;
+
+class FSFloaterVRAMUsage : public LLFloater, public nd::selection::PropertiesListener
+{
+public:
+ FSFloaterVRAMUsage(const LLSD& seed);
+ /*virtual*/ ~FSFloaterVRAMUsage();
+ /*virtual*/ void onOpen(const LLSD& key);
+
+ BOOL postBuild();
+
+ virtual void onProperties( LLSelectNode const * );
+
+ void onIdle();
+
+private:
+ void doRefresh();
+
+ void addObjectToList( LLViewerObject*, std::string const& );
+ void calcFaceSize( LLFace *aFace, S32 &aW, S32 &aH );
+ S32 calcVBOEntrySize( LLVertexBuffer *aVBO );
+ U32 calcTexturSize( LLViewerObject*, std::ostream * = 0 );
+
+ struct ImplData;
+ ImplData *mData;
+};
+
+#endif // FS_FLOATERBLOCKLIST_H
diff --git a/indra/newview/fsfloaterwsassetblacklist.cpp b/indra/newview/fsfloaterwsassetblacklist.cpp
index d1e7dec5c5..a50104490a 100644
--- a/indra/newview/fsfloaterwsassetblacklist.cpp
+++ b/indra/newview/fsfloaterwsassetblacklist.cpp
@@ -61,6 +61,9 @@ std::string FSFloaterWSAssetBlacklist::getTypeString(S32 type)
case 6:
return getString("asset_object");
break;
+ case 45:
+ return getString("asset_resident");
+ break;
default:
return getString("asset_unknown");
break;
diff --git a/indra/newview/fskeywords.cpp b/indra/newview/fskeywords.cpp
index 59c37f272f..836eda8f68 100644
--- a/indra/newview/fskeywords.cpp
+++ b/indra/newview/fskeywords.cpp
@@ -35,13 +35,12 @@
#include "llviewercontrol.h"
#include
-//#include //for boost::ifind_first
-
FSKeywords::FSKeywords()
{
gSavedPerAccountSettings.getControl("FSKeywords")->getSignal()->connect(boost::bind(&FSKeywords::updateKeywords, this));
gSavedPerAccountSettings.getControl("FSKeywordCaseSensitive")->getSignal()->connect(boost::bind(&FSKeywords::updateKeywords, this));
+ gSavedPerAccountSettings.getControl("FSKeywordMatchWholeWords")->getSignal()->connect(boost::bind(&FSKeywords::updateKeywords, this));
updateKeywords();
}
@@ -51,6 +50,7 @@ FSKeywords::~FSKeywords()
void FSKeywords::updateKeywords()
{
+ BOOL match_whole_words = gSavedPerAccountSettings.getBOOL("FSKeywordMatchWholeWords");
std::string s = gSavedPerAccountSettings.getString("FSKeywords");
if (!gSavedPerAccountSettings.getBOOL("FSKeywordCaseSensitive"))
{
@@ -61,7 +61,14 @@ void FSKeywords::updateKeywords()
mWordList.clear();
while (begin != end)
{
- mWordList.push_back(*begin++);
+ if (match_whole_words)
+ {
+ mWordList.push_back(boost::regex_replace(std::string(*begin++), boost::regex("[.^$|()\\[\\]{}*+?\\\\]"), "\\\\&", boost::match_default|boost::format_sed));
+ }
+ else
+ {
+ mWordList.push_back(*begin++);
+ }
}
}
@@ -71,6 +78,7 @@ bool FSKeywords::chatContainsKeyword(const LLChat& chat, bool is_local)
static LLCachedControl sFSKeywordInChat(gSavedPerAccountSettings, "FSKeywordInChat", false);
static LLCachedControl sFSKeywordInIM(gSavedPerAccountSettings, "FSKeywordInIM", false);
static LLCachedControl sFSKeywordCaseSensitive(gSavedPerAccountSettings, "FSKeywordCaseSensitive", false);
+ static LLCachedControl sFSKeywordMatchWholeWords(gSavedPerAccountSettings, "FSKeywordMatchWholeWords", false);
if (!sFSKeywordOn ||
(is_local && !sFSKeywordInChat) ||
@@ -86,13 +94,27 @@ bool FSKeywords::chatContainsKeyword(const LLChat& chat, bool is_local)
LLStringUtil::toLower(source);
}
- for (std::vector::iterator it = mWordList.begin(); it != mWordList.end(); ++it)
+ if (sFSKeywordMatchWholeWords)
{
- if (source.find((*it)) != std::string::npos)
+ for (std::vector::iterator it = mWordList.begin(); it != mWordList.end(); ++it)
{
- return true;
+ if (boost::regex_search(source, boost::regex("\\b" + (*it) + "\\b")))
+ {
+ return true;
+ }
}
}
+ else
+ {
+ for (std::vector::iterator it = mWordList.begin(); it != mWordList.end(); ++it)
+ {
+ if (source.find((*it)) != std::string::npos)
+ {
+ return true;
+ }
+ }
+ }
+
return false;
}
@@ -101,7 +123,7 @@ void FSKeywords::notify(const LLChat& chat)
{
if (chat.mFromID != gAgentID || chat.mFromName == SYSTEM_FROM)
{
- if (!LLMuteList::getInstance()->isMuted(chat.mFromID) && !chat.mMuted)
+ if (!chat.mMuted && !LLMuteList::getInstance()->isMuted(chat.mFromID))
{
static LLCachedControl PlayModeUISndFSKeywordSound(gSavedSettings, "PlayModeUISndFSKeywordSound");
if (PlayModeUISndFSKeywordSound)
diff --git a/indra/newview/fslslbridge.h b/indra/newview/fslslbridge.h
index f555722d75..8b21f40c8f 100644
--- a/indra/newview/fslslbridge.h
+++ b/indra/newview/fslslbridge.h
@@ -77,6 +77,7 @@ public:
void setBridge(LLViewerInventoryItem* item) { mpBridge = item; };
LLViewerInventoryItem* getBridge() { return mpBridge; };
bool canUseBridge();
+ bool isBridgeValid() const { return NULL != mpBridge; }
void checkBridgeScriptName(const std::string& fileName);
std::string currentFullName() { return mCurrentFullName; }
@@ -106,7 +107,6 @@ private:
LLUUID mBridgeUUID;
bool mIsFirstCallDone; //initialization conversation
- bool isBridgeValid() const { return NULL != mpBridge; }
uuid_vec_t mAllowedDetachables;
diff --git a/indra/newview/fslslbridgerequest.cpp b/indra/newview/fslslbridgerequest.cpp
index 8baa612a58..58a81c9281 100644
--- a/indra/newview/fslslbridgerequest.cpp
+++ b/indra/newview/fslslbridgerequest.cpp
@@ -89,7 +89,7 @@ void FSLSLBridgeRequestRadarPosResponder::result(const LLSD& content)
FSRadarEntry* entry = radar->getEntry(targetAv);
if (entry)
{
- entry->setZOffset((F32)(targetZ));
+ entry->setZOffset(targetZ);
//LL_INFOS() << targetAv << " ::: " << targetZ << LL_ENDL;
}
}
diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp
index 5c8f22739c..78f52a0c45 100644
--- a/indra/newview/fslslpreproc.cpp
+++ b/indra/newview/fslslpreproc.cpp
@@ -137,7 +137,6 @@ using namespace boost::regex_constants;
std::string FSLSLPreprocessor::encode(std::string script)
{
-
std::string otext = FSLSLPreprocessor::decode(script);
BOOL mono = mono_directive(script);
@@ -157,19 +156,17 @@ std::string FSLSLPreprocessor::encode(std::string script)
if(mono)otext += "//mono\n";
else otext += "//lsl2\n";
-
return otext;
}
std::string FSLSLPreprocessor::decode(std::string script)
{
-
static S32 startpoint = encode_start.length();
std::string tip = script.substr(0,startpoint);
- if(tip != encode_start)
+ if (tip != encode_start)
{
LL_DEBUGS() << "No start" << LL_ENDL;
//if(sp != -1)trigger warningg/error?
@@ -178,24 +175,19 @@ std::string FSLSLPreprocessor::decode(std::string script)
S32 end = script.find(encode_end);
- if(end == -1)
+ if (end == -1)
{
LL_DEBUGS() << "No end" << LL_ENDL;
return script;
}
-
std::string data = script.substr(startpoint,end-startpoint);
LL_DEBUGS() << "data = " << data << LL_ENDL;
-
std::string otext = data;
-
-
otext = boost::regex_replace(otext, boost::regex("([/*])\\|",boost::regex::perl), "$1");
-
//otext = curl_unescape(otext.c_str(),otext.length());
return otext;
@@ -204,30 +196,36 @@ std::string FSLSLPreprocessor::decode(std::string script)
std::string scopeript2(std::string& top, S32 fstart, char left = '{', char right = '}')
{
-
- if(fstart >= int(top.length()))
+ if (fstart >= S32(top.length()))
{
return "begin out of bounds";
}
- int cursor = fstart;
+ S32 cursor = fstart;
bool noscoped = true;
bool in_literal = false;
- int count = 0;
+ S32 count = 0;
char ltoken = ' ';
do
{
char token = top.at(cursor);
- if(token == '"' && ltoken != '\\')in_literal = !in_literal;
- else if(token == '\\' && ltoken == '\\')token = ' ';
- else if(!in_literal)
+ if (token == '"' && ltoken != '\\')
{
- if(token == left)
+ in_literal = !in_literal;
+ }
+ else if (token == '\\' && ltoken == '\\')
+ {
+ token = ' ';
+ }
+ else if (!in_literal)
+ {
+ if (token == left)
{
count += 1;
noscoped = false;
- }else if(token == right)
+ }
+ else if (token == right)
{
count -= 1;
noscoped = false;
@@ -235,9 +233,11 @@ std::string scopeript2(std::string& top, S32 fstart, char left = '{', char right
}
ltoken = token;
cursor += 1;
- }while((count > 0 || noscoped) && cursor < int(top.length()));
- int end = (cursor-fstart);
- if(end > int(top.length()))
+ }
+ while ((count > 0 || noscoped) && cursor < S32(top.length()));
+
+ S32 end = (cursor-fstart);
+ if (end > S32(top.length()))
{
return "end out of bounds";
}
@@ -245,19 +245,20 @@ std::string scopeript2(std::string& top, S32 fstart, char left = '{', char right
return top.substr(fstart,(cursor-fstart));
}
-inline int const_iterator_to_pos(std::string::const_iterator begin, std::string::const_iterator cursor)
+inline S32 const_iterator_to_pos(std::string::const_iterator begin, std::string::const_iterator cursor)
{
return std::distance(begin, cursor);
}
void shredder(std::string& text)
{
- int cursor = 0;
- if(int(text.length()) == 0)
+ S32 cursor = 0;
+ if (text.length() == 0)
{
- text = "y u do dis?";
+ text = "No text to shredder.";
return;
}
+
char ltoken = ' ';
do
{
@@ -266,7 +267,7 @@ void shredder(std::string& text)
{
ltoken = token;
token = text[++cursor];
- while(cursor < int(text.length()))
+ while(cursor < S32(text.length()))
{
if(token == '\\' && ltoken == '\\') token = ' ';
if(token == '"' && ltoken != '\\')
@@ -294,13 +295,14 @@ void shredder(std::string& text)
}
ltoken = token;
++cursor;
- }while(cursor < int(text.length()));
+ }
+ while (cursor < S32(text.length()));
}
std::string FSLSLPreprocessor::lslopt(std::string script)
{
- script = " \n"+script;//HACK//this should prevent regex fail for functions starting on line 0, column 0
+ script = " \n" + script;//HACK//this should prevent regex fail for functions starting on line 0, column 0
//added more to prevent split fail on scripts with no global data
//this should be fun
@@ -327,13 +329,13 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
std::set kept_functions;
std::map functions;
- while(boost::regex_search(std::string::const_iterator(top.begin()), std::string::const_iterator(top.end()), TOPfmatch, findfuncts, boost::match_default))
+ while (boost::regex_search(std::string::const_iterator(top.begin()), std::string::const_iterator(top.end()), TOPfmatch, findfuncts, boost::match_default))
{
//std::string type = TOPfmatch[1];
std::string funcname = TOPfmatch[2];
- int pos = TOPfmatch.position(boost::match_results::size_type(0));
+ S32 pos = TOPfmatch.position(boost::match_results::size_type(0));
std::string funcb = scopeript2(top, pos);
functions[funcname] = funcb;
LL_DEBUGS() << "func " << funcname << " added to list[" << funcb << "]" << LL_ENDL;
@@ -346,12 +348,12 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
repass = false;
std::map::iterator func_it;
- for(func_it = functions.begin(); func_it != functions.end(); func_it++)
+ for (func_it = functions.begin(); func_it != functions.end(); func_it++)
{
std::string funcname = func_it->first;
- if(kept_functions.find(funcname) == kept_functions.end())
+ if (kept_functions.find(funcname) == kept_functions.end())
{
boost::smatch calls;
@@ -361,7 +363,7 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
std::string::const_iterator bstart = bottom.begin();
std::string::const_iterator bend = bottom.end();
- if(boost::regex_search(bstart, bend, calls, findcalls, boost::match_default))
+ if (boost::regex_search(bstart, bend, calls, findcalls, boost::match_default))
{
std::string function = func_it->second;
@@ -371,7 +373,8 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
}
}
}
- }while(repass);
+ }
+ while (repass);
std::map gvars;
boost::regex findvars("(integer|float|string|key|vector|rotation|list)\\s+([a-zA-Z0-9_]+)([^\\(\\);]*;)");
@@ -384,12 +387,12 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
std::string fullref = TOPvmatch[1] + " " + varname+TOPvmatch[3];
gvars[varname] = fullref;
- int start = const_iterator_to_pos(std::string::const_iterator(top.begin()), TOPvmatch[1].first);
+ S32 start = const_iterator_to_pos(std::string::const_iterator(top.begin()), TOPvmatch[1].first);
top.erase(start,fullref.length());
}
std::map::iterator var_it;
- for(var_it = gvars.begin(); var_it != gvars.end(); var_it++)
+ for (var_it = gvars.begin(); var_it != gvars.end(); var_it++)
{
std::string varname = var_it->first;
@@ -398,7 +401,7 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
std::string::const_iterator bstart = bottom.begin();
std::string::const_iterator bend = bottom.end();
- if(boost::regex_search(bstart, bend, vcalls, findvcalls, boost::match_default))
+ if (boost::regex_search(bstart, bend, vcalls, findvcalls, boost::match_default))
{
bottom = var_it->second + "\n" + bottom;
}
@@ -457,17 +460,16 @@ inline std::string shortfile(std::string in)
class trace_include_files : public boost::wave::context_policies::default_preprocessing_hooks
{
public:
- trace_include_files(FSLSLPreprocessor* proc)
- : mProc(proc)
- {
+ trace_include_files(FSLSLPreprocessor* proc)
+ : mProc(proc)
+ {
mAssetStack.push(LLUUID::null.asString());
mFileStack.push(proc->mMainScriptName);
}
template
- bool found_include_directive(ContextT const& ctx,
- std::string const &filename, bool include_next)
+ bool found_include_directive(ContextT const& ctx, std::string const &filename, bool include_next)
{
std::string cfilename = filename.substr(1,filename.length()-2);
LL_DEBUGS() << cfilename << ":found_include_directive" << LL_ENDL;
@@ -512,13 +514,14 @@ public:
}
}
}
- }else
+ }
+ else
{
//todo check on HDD in user defined dir for file in question
}
- //++include_depth;
+ //++include_depth;
return false;
- }
+ }
template
void opened_include_file(ContextT const& ctx,
@@ -530,10 +533,14 @@ public:
std::string id;
std::string filename = shortfile(relname);//boost::filesystem::path(std::string(relname)).filename();
std::map::iterator it = mProc->cached_assetids.find(filename);
- if(it != mProc->cached_assetids.end())
+ if (it != mProc->cached_assetids.end())
{
id = mProc->cached_assetids[filename].asString();
- }else id = "NOT_IN_WORLD";//I guess, still need to add external includes atm
+ }
+ else
+ {
+ id = "NOT_IN_WORLD";//I guess, still need to add external includes atm
+ }
mAssetStack.push(id);
std::string macro = "__ASSETID__";
usefulctx.remove_macro_definition(macro, true);
@@ -575,12 +582,14 @@ public:
{
std::string err;
err = "warning: last line of file ends without a newline";
- if( !err.compare( e.description())){
+ if( !err.compare( e.description()))
+ {
err = "Ignoring warning: ";
err += e.description();
LL_WARNS() << err << LL_ENDL;
}
- else{
+ else
+ {
boost::throw_exception(e);
}
}
@@ -594,7 +603,7 @@ private:
std::string cachepath(std::string name)
{
- return gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"lslpreproc",name);
+ return gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "lslpreproc", name);
}
void cache_script(std::string name, std::string content)
@@ -612,16 +621,15 @@ void cache_script(std::string name, std::string content)
void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLAssetType::EType type, void *userdata, S32 result, LLExtStat extstat)
{
-
LLUUID uuid = iuuid;
LL_DEBUGS() << "cachecallback called" << LL_ENDL;
- ProcCacheInfo* info =(ProcCacheInfo*)userdata;
+ ProcCacheInfo* info = (ProcCacheInfo*)userdata;
LLViewerInventoryItem* item = info->item;
FSLSLPreprocessor* self = info->self;
- if(item && self)
+ if (item && self)
{
std::string name = item->getName();
- if(result == LL_ERR_NOERR)
+ if (result == LL_ERR_NOERR)
{
LLVFile file(vfs, uuid, type);
S32 file_length = file.getSize();
@@ -637,13 +645,13 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
content += "\n#define __ITEMID__ __UP_ITEMID__\n";*/
//prolly wont work and ill have to be not lazy, but worth a try
delete buffer;
- if(boost::filesystem::native(name))
+ if (boost::filesystem::native(name))
{
LL_DEBUGS() << "native name of " << name << LL_ENDL;
- self->mCore->mErrorList->setCommentText(std::string("Cached ")+name);
+ self->mCore->mErrorList->setCommentText("Cached " + name);
cache_script(name, content);
std::set::iterator loc = self->caching_files.find(name);
- if(loc != self->caching_files.end())
+ if (loc != self->caching_files.end())
{
LL_DEBUGS() << "finalizing cache" << LL_ENDL;
self->caching_files.erase(loc);
@@ -666,33 +674,36 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
}
}
- if(info)
+ if (info)
{
delete info;
}
}
-void FSLSLPreprocessor::preprocess_script(BOOL close, BOOL defcache)
+void FSLSLPreprocessor::preprocess_script(BOOL close, bool sync, BOOL defcache)
{
mClose = close;
+ mSync = sync;
mDefinitionCaching = defcache;
caching_files.clear();
- mCore->mErrorList->setCommentText(std::string("PreProc Starting..."));
+ mCore->mErrorList->setCommentText("PreProc Starting...");
- LLFile::mkdir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"")+gDirUtilp->getDirDelimiter()+"lslpreproc");
+ LLFile::mkdir(gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() + "lslpreproc");
std::string script = mCore->mEditor->getText();
- if(mMainScriptName == "")//more sanity
+ if (mMainScriptName.empty())//more sanity
{
const LLInventoryItem* item = NULL;
LLPreview* preview = (LLPreview*)mCore->mUserdata;
- if(preview)
+ if (preview)
{
item = preview->getItem();
}
- if(item)
+
+ if (item)
{
mMainScriptName = item->getName();
- }else
+ }
+ else
{
mMainScriptName = "(Unknown)";
}
@@ -702,7 +713,6 @@ void FSLSLPreprocessor::preprocess_script(BOOL close, BOOL defcache)
cache_script(name, script);
//start the party
start_process();
-
}
const std::string lazy_list_set_func("\
@@ -730,15 +740,15 @@ list lazy_list_set(list target, integer pos, list newval)\n\
std::string reformat_lazy_lists(std::string script)
{
- BOOL add_set = FALSE;
+ bool add_set = false;
std::string nscript = script;
nscript = boost::regex_replace(nscript, boost::regex("([a-zA-Z0-9_]+)\\[([a-zA-Z0-9_()\"]+)]\\s*=\\s*([a-zA-Z0-9_()\"\\+\\-\\*/]+)([;)])",boost::regex::perl), "$1=lazy_list_set($1,$2,[$3])$4");
- if(nscript != script)
+ if (nscript != script)
{
- add_set = TRUE;
+ add_set = true;
}
- if(add_set == TRUE)
+ if (add_set)
{
//add lazy_list_set function to top of script, as it is used
nscript = utf8str_removeCRLF(lazy_list_set_func) + "\n" + nscript;
@@ -747,14 +757,14 @@ std::string reformat_lazy_lists(std::string script)
}
-inline std::string randstr(int len, std::string chars)
+inline std::string randstr(S32 len, std::string chars)
{
- int clen = int(chars.length());
- int built = 0;
+ S32 clen = S32(chars.length());
+ S32 built = 0;
std::string ret;
- while(built < len)
+ while (built < len)
{
- int r = std::rand() / ( RAND_MAX / clen );
+ S32 r = std::rand() / ( RAND_MAX / clen );
r = r % clen;//sanity
ret += chars.at(r);
built += 1;
@@ -764,12 +774,12 @@ inline std::string randstr(int len, std::string chars)
inline std::string quicklabel()
{
- return std::string("c")+randstr(5,"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
+ return std::string("c") + randstr(5, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
}
std::string minimalize_whitespace(std::string in)
{
- return boost::regex_replace(in, boost::regex("\\s*",boost::regex::perl), "\n");
+ return boost::regex_replace(in, boost::regex("\\s*",boost::regex::perl), "\n");
}
std::string reformat_switch_statements(std::string script)
@@ -784,13 +794,13 @@ std::string reformat_switch_statements(std::string script)
static std::string switchstr = "switch(";
- int escape = 100;
+ S32 escape = 100;
while(boost::regex_search(std::string::const_iterator(buffer.begin()), std::string::const_iterator(buffer.end()), matches, findswitches, boost::match_default) && escape > 1)
{
- int res = matches.position(boost::match_results::size_type(0))+1;
+ S32 res = matches.position(boost::match_results::size_type(0))+1;
- static int slen = switchstr.length();
+ static S32 slen = switchstr.length();
std::string arg = scopeript2(buffer, res+slen-1,'(',')');
@@ -803,7 +813,7 @@ std::string reformat_switch_statements(std::string script)
LL_DEBUGS() << "arg=[" << arg << "]" << LL_ENDL;;
std::string rstate = scopeript2(buffer, res+slen+arg.length()-1);
- int cutlen = slen;
+ S32 cutlen = slen;
cutlen -= 1;
cutlen += arg.length();
cutlen += rstate.length();
@@ -811,7 +821,7 @@ std::string reformat_switch_statements(std::string script)
//then add arg len and state len to get section to excise
//rip off the scope edges
- int slicestart = rstate.find("{")+1;
+ S32 slicestart = rstate.find("{")+1;
rstate = rstate.substr(slicestart,(rstate.rfind("}")-slicestart)-1);
LL_DEBUGS() << "rstate=[" << rstate << "]" << LL_ENDL;
@@ -825,11 +835,11 @@ std::string reformat_switch_statements(std::string script)
{
//if(statematches[0].matched)
{
- int case_start = statematches.position(boost::match_results::size_type(0))+1;//const_iterator2pos(statematches[0].first+1, std::string::const_iterator(rstate.begin()))-1;
- int next_curl = rstate.find("{",case_start+1);
- int next_semi = rstate.find(":",case_start+1);
- int case_end = (next_curl < next_semi && next_curl != -1) ? next_curl : next_semi;
- static int caselen = std::string("case").length();
+ S32 case_start = statematches.position(boost::match_results::size_type(0))+1;//const_iterator2pos(statematches[0].first+1, std::string::const_iterator(rstate.begin()))-1;
+ S32 next_curl = rstate.find("{",case_start+1);
+ S32 next_semi = rstate.find(":",case_start+1);
+ S32 case_end = (next_curl < next_semi && next_curl != -1) ? next_curl : next_semi;
+ static S32 caselen = std::string("case").length();
if(case_end != -1)
{
std::string casearg = rstate.substr(case_start+caselen,case_end-(case_start+caselen));
@@ -928,11 +938,12 @@ std::string reformat_switch_statements(std::string script)
void FSLSLPreprocessor::start_process()
{
- if(mWaving)
+ if (mWaving)
{
LL_WARNS() << "already waving?" << LL_ENDL;
return;
}
+
mWaving = TRUE;
boost::wave::util::file_position_type current_position;
std::string input = mCore->mEditor->getText();
@@ -944,31 +955,34 @@ void FSLSLPreprocessor::start_process()
std::string name = mMainScriptName;
bool lazy_lists = gSavedSettings.getBOOL("_NACL_PreProcLSLLazyLists");
bool use_switch = gSavedSettings.getBOOL("_NACL_PreProcLSLSwitch");
+ bool use_optimizer = gSavedSettings.getBOOL("_NACL_PreProcLSLOptimizer");
+ bool enable_hdd_include = gSavedSettings.getBOOL("_NACL_PreProcEnableHDDInclude");
+ bool use_compression = gSavedSettings.getBOOL("_NACL_PreProcLSLTextCompress");
std::string settings;
settings = "Settings: preproc ";
if (lazy_lists)
{
- settings = settings + " Lazy Lists";
- }
+ settings = settings + " Lazy Lists";
+ }
if (use_switch)
{
- settings = settings + " Switches";
+ settings = settings + " Switches";
}
- if(gSavedSettings.getBOOL("_NACL_PreProcLSLOptimizer"))
+ if (use_optimizer)
{
- settings = settings + " Optimize";
+ settings = settings + " Optimize";
}
- if(gSavedSettings.getBOOL("_NACL_PreProcEnableHDDInclude"))
+ if (enable_hdd_include)
{
- settings = settings + " HDDInclude";
+ settings = settings + " HDDInclude";
}
- if(gSavedSettings.getBOOL("_NACL_PreProcLSLTextCompress"))
+ if (use_compression)
{
- settings = settings + " Compress";
+ settings = settings + " Compress";
}
//display the settings
- mCore->mErrorList->setCommentText(std::string(settings));
-
+ mCore->mErrorList->setCommentText(settings);
+
LL_DEBUGS() << settings << LL_ENDL;
bool errored = false;
std::string err;
@@ -985,29 +999,29 @@ void FSLSLPreprocessor::start_process()
ctx.set_language(boost::wave::enable_prefer_pp_numbers(ctx.get_language()));
ctx.set_language(boost::wave::enable_variadics(ctx.get_language()));
- std::string path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"")+gDirUtilp->getDirDelimiter()+"lslpreproc"+gDirUtilp->getDirDelimiter();
+ std::string path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() + "lslpreproc" + gDirUtilp->getDirDelimiter();
ctx.add_include_path(path.c_str());
- if(gSavedSettings.getBOOL("_NACL_PreProcEnableHDDInclude"))
+ if (enable_hdd_include)
{
std::string hddpath = gSavedSettings.getString("_NACL_PreProcHDDIncludeLocation");
- if(hddpath != "")
+ if (!hddpath.empty())
{
ctx.add_include_path(hddpath.c_str());
ctx.add_sysinclude_path(hddpath.c_str());
}
}
- std::string def = llformat("__AGENTKEY__=\"%s\"",gAgent.getID().asString().c_str());//legacy because I used it earlier
+ std::string def = llformat("__AGENTKEY__=\"%s\"", gAgentID.asString().c_str());//legacy because I used it earlier
ctx.add_macro_definition(def,false);
- def = llformat("__AGENTID__=\"%s\"",gAgent.getID().asString().c_str());
+ def = llformat("__AGENTID__=\"%s\"", gAgentID.asString().c_str());
ctx.add_macro_definition(def,false);
- def = llformat("__AGENTIDRAW__=%s",gAgent.getID().asString().c_str());
+ def = llformat("__AGENTIDRAW__=%s", gAgentID.asString().c_str());
ctx.add_macro_definition(def,false);
std::string aname = gAgentAvatarp->getFullname();
- def = llformat("__AGENTNAME__=\"%s\"",aname.c_str());
+ def = llformat("__AGENTNAME__=\"%s\"", aname.c_str());
ctx.add_macro_definition(def,false);
- def = llformat("__ASSETID__=%s",LLUUID::null.asString().c_str());
+ def = llformat("__ASSETID__=%s", LLUUID::null.asString().c_str());
ctx.add_macro_definition(def,false);
- def = llformat("__SHORTFILE__=\"%s\"",name.c_str());
+ def = llformat("__SHORTFILE__=\"%s\"", name.c_str());
ctx.add_macro_definition(def,false);
ctx.add_macro_definition("list(input)=((list)(input))",false);
@@ -1022,15 +1036,15 @@ void FSLSLPreprocessor::start_process()
context_type::iterator_type first = ctx.begin();
context_type::iterator_type last = ctx.end();
-
- while (first != last)
+
+ while (first != last)
{
- if(caching_files.size() != 0)
+ if (caching_files.size() != 0)
{
mWaving = FALSE;
return;
}
- current_position = (*first).get_position();
+ current_position = (*first).get_position();
std::string token = std::string((*first).get_value().c_str());//stupid boost bitching even though we know its a std::string
@@ -1041,17 +1055,17 @@ void FSLSLPreprocessor::start_process()
output += token;
- if(lazy_lists == FALSE)
+ if (!lazy_lists)
{
lazy_lists = ctx.is_defined_macro(std::string("USE_LAZY_LISTS"));
}
- if(use_switch == FALSE)
+ if (!use_switch)
{
use_switch = ctx.is_defined_macro(std::string("USE_SWITCHES"));
}
- ++first;
- }
+ ++first;
+ }
}
catch(boost::wave::cpp_exception const& e)
{
@@ -1080,31 +1094,33 @@ void FSLSLPreprocessor::start_process()
mCore->mErrorList->setCommentText(err);
}
- if(!errored)
+ if (!errored)
{
FAILDEBUG
- if(lazy_lists == TRUE)
+ if (lazy_lists)
{
try
{
mCore->mErrorList->setCommentText("Applying lazy list set transform");
output = reformat_lazy_lists(output);
- }catch(...)
- {
+ }
+ catch(...)
+ {
errored = TRUE;
err = "unexpected exception in lazy list converter.";
mCore->mErrorList->setCommentText(err);
}
}
- if(use_switch == TRUE)
+ if (use_switch)
{
try
{
mCore->mErrorList->setCommentText("Applying switch statement transform");
output = reformat_switch_statements(output);
- }catch(...)
- {
+ }
+ catch(...)
+ {
errored = TRUE;
err = "unexpected exception in switch statement converter.";
mCore->mErrorList->setCommentText(err);
@@ -1112,11 +1128,11 @@ void FSLSLPreprocessor::start_process()
}
}
- if(!mDefinitionCaching)
+ if (!mDefinitionCaching)
{
- if(!errored)
+ if (!errored)
{
- if(gSavedSettings.getBOOL("_NACL_PreProcLSLOptimizer"))
+ if (use_optimizer)
{
mCore->mErrorList->setCommentText("Optimizing out unreferenced user-defined functions and global variables");
try
@@ -1131,32 +1147,33 @@ void FSLSLPreprocessor::start_process()
}
}
}
- if(!errored)
+ if (!errored)
{
- if(gSavedSettings.getBOOL("_NACL_PreProcLSLTextCompress"))
+ if (use_compression)
{
mCore->mErrorList->setCommentText("Compressing lsltext by removing unnecessary space");
try
{
output = lslcomp(output);
- }catch(...)
- {
+ }
+ catch(...)
+ {
errored = TRUE;
err = "unexpected exception in lsl compressor";
mCore->mErrorList->setCommentText(err);
}
}
}
- output = encode(rinput)+"\n\n"+output;
+ output = encode(rinput) + "\n\n" + output;
LLTextEditor* outfield = mCore->mPostEditor;//getChild("post_process");
- if(outfield)
+ if (outfield)
{
outfield->setText(LLStringExplicit(output));
}
mCore->mPostScript = output;
- mCore->doSaveComplete((void*)mCore,mClose);
+ mCore->doSaveComplete((void*)mCore, mClose, mSync);
}
mWaving = FALSE;
}
@@ -1207,13 +1224,13 @@ bool FSLSLPreprocessor::mono_directive(std::string const& text, bool agent_inv)
{
bool domono = agent_inv;
- if(text.find("//mono\n") != -1)
+ if (text.find("//mono\n") != -1)
{
- domono = TRUE;
+ domono = true;
}
- else if(text.find("//lsl2\n") != -1)
+ else if (text.find("//lsl2\n") != -1)
{
- domono = FALSE;
+ domono = false;
}
return domono;
}
diff --git a/indra/newview/fslslpreproc.h b/indra/newview/fslslpreproc.h
index 17bf9ffc93..7b1222518d 100644
--- a/indra/newview/fslslpreproc.h
+++ b/indra/newview/fslslpreproc.h
@@ -46,7 +46,7 @@ class FSLSLPreprocessor
public:
FSLSLPreprocessor(LLScriptEdCore* corep)
- : mCore(corep), mWaving(FALSE), mClose(FALSE)
+ : mCore(corep), mWaving(FALSE), mClose(FALSE), mSync(false)
{}
static bool mono_directive(std::string const& text, bool agent_inv = true);
@@ -59,7 +59,7 @@ public:
static LLUUID findInventoryByName(std::string name);
static void FSProcCacheCallback(LLVFS *vfs, const LLUUID& uuid, LLAssetType::EType type,
void *userdata, S32 result, LLExtStat extstat);
- void preprocess_script(BOOL close = FALSE, BOOL defcache = FALSE);
+ void preprocess_script(BOOL close = FALSE, bool sync = false, BOOL defcache = FALSE);
void start_process();
void display_error(std::string err);
@@ -86,6 +86,7 @@ public:
LLScriptEdCore* mCore;
BOOL mWaving;
BOOL mClose;
+ bool mSync;
BOOL mHDDInclude;
std::string mMainScriptName;
};
diff --git a/indra/newview/fsnearbychatcontrol.cpp b/indra/newview/fsnearbychatcontrol.cpp
index d9bbff2c1a..56c4602d09 100644
--- a/indra/newview/fsnearbychatcontrol.cpp
+++ b/indra/newview/fsnearbychatcontrol.cpp
@@ -357,19 +357,19 @@ BOOL FSNearbyChatControl::handleKeyHere(KEY key, MASK mask )
}
else if( KEY_RETURN == key )
{
- if (mask == MASK_CONTROL)
+ if (mask == MASK_CONTROL && gSavedSettings.getBOOL("FSUseCtrlShout"))
{
// shout
type = CHAT_TYPE_SHOUT;
handled = TRUE;
}
- else if (mask == MASK_SHIFT)
+ else if (mask == MASK_SHIFT && gSavedSettings.getBOOL("FSUseShiftWhisper"))
{
// whisper
type = CHAT_TYPE_WHISPER;
handled = TRUE;
}
- else if (mask == MASK_ALT)
+ else if (mask == MASK_ALT && gSavedSettings.getBOOL("FSUseAltOOC"))
{
// OOC
type = CHAT_TYPE_OOC;
@@ -381,6 +381,12 @@ BOOL FSNearbyChatControl::handleKeyHere(KEY key, MASK mask )
type = CHAT_TYPE_NORMAL;
handled = TRUE;
}
+ else
+ {
+ // say
+ type = CHAT_TYPE_NORMAL;
+ handled = TRUE;
+ }
}
if (handled == TRUE)
diff --git a/indra/newview/fsnearbychathub.cpp b/indra/newview/fsnearbychathub.cpp
index d8535f0834..19f80b0c5f 100644
--- a/indra/newview/fsnearbychathub.cpp
+++ b/indra/newview/fsnearbychathub.cpp
@@ -480,7 +480,10 @@ void FSNearbyChat::sendChat(LLWString text, EChatType type)
utf8text = applyMuPose(utf8text);
// discard returned "found" boolean
- LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text);
+ if(!LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text))
+ {
+ utf8_revised_text = utf8text;
+ }
}
else
{
diff --git a/indra/newview/fspanelblocklist.cpp b/indra/newview/fspanelblocklist.cpp
index b7fa6ead61..ce1a0d0469 100644
--- a/indra/newview/fspanelblocklist.cpp
+++ b/indra/newview/fspanelblocklist.cpp
@@ -125,6 +125,11 @@ void FSPanelBlockList::selectBlocked(const LLUUID& mute_id)
void FSPanelBlockList::showPanelAndSelect(const LLUUID& idToSelect)
{
+ if (gSavedSettings.getBOOL("FSDisableBlockListAutoOpen"))
+ {
+ return;
+ }
+
if (gSavedSettings.getBOOL("FSUseStandaloneBlocklistFloater"))
{
LLFloaterReg::showInstance("fs_blocklist", LLSD().with(BLOCKED_PARAM_NAME, idToSelect));
@@ -162,7 +167,9 @@ void FSPanelBlockList::refreshBlockedList()
void FSPanelBlockList::updateButtons()
{
- getChildView("unblock_btn")->setEnabled(mBlockedList->getNumSelected() > 0);
+ bool has_selection = mBlockedList->getNumSelected() > 0;
+ getChildView("blocked_gear_btn")->setEnabled(has_selection);
+ getChildView("unblock_btn")->setEnabled(has_selection);
}
void FSPanelBlockList::removeMutes()
@@ -300,7 +307,7 @@ void FSPanelBlockList::blockResidentByName()
void FSPanelBlockList::blockObjectByName()
{
- LLFloaterGetBlockedObjectName* picker = LLFloaterGetBlockedObjectName::show(&FSPanelBlockList::callbackBlockByName);
+ LLFloaterGetBlockedObjectName* picker = LLFloaterGetBlockedObjectName::show(boost::bind(&FSPanelBlockList::callbackBlockByName, this, _1));
LLFloater* parent = dynamic_cast(getParent());
if (parent)
{
@@ -331,7 +338,6 @@ void FSPanelBlockList::callbackBlockPicked(const uuid_vec_t& ids, const std::vec
showPanelAndSelect(mute.mID);
}
-//static
void FSPanelBlockList::callbackBlockByName(const std::string& text)
{
if (text.empty()) return;
@@ -342,6 +348,11 @@ void FSPanelBlockList::callbackBlockByName(const std::string& text)
{
LLNotificationsUtil::add("MuteByNameFailed");
}
+ else
+ {
+ mBlockedList->selectItemByLabel(text);
+ mBlockedList->scrollToShowSelected();
+ }
}
void FSPanelBlockList::onFilterEdit(std::string search_string)
diff --git a/indra/newview/fspanelblocklist.h b/indra/newview/fspanelblocklist.h
index ce7da3dcca..4113f5f096 100644
--- a/indra/newview/fspanelblocklist.h
+++ b/indra/newview/fspanelblocklist.h
@@ -57,7 +57,7 @@ public:
* @param idToSelect - LLUUID of blocked Resident or Object to be selected.
* If it is LLUUID::null, nothing will be selected.
*/
- static void showPanelAndSelect(const LLUUID& idToSelect);
+ static void showPanelAndSelect(const LLUUID& idToSelect = LLUUID::null);
// LLMuteListObserver callback interface implementation.
/* virtual */ void onChange() { refreshBlockedList();}
@@ -90,7 +90,7 @@ private:
bool isActionEnabled(const LLSD& userdata);
void callbackBlockPicked(const uuid_vec_t& ids, const std::vector names);
- static void callbackBlockByName(const std::string& text);
+ void callbackBlockByName(const std::string& text);
private:
FSBlockListCtrl* mBlockedList;
diff --git a/indra/newview/fspanelprofile.cpp b/indra/newview/fspanelprofile.cpp
index 3b5e2c0ad7..93097800e2 100644
--- a/indra/newview/fspanelprofile.cpp
+++ b/indra/newview/fspanelprofile.cpp
@@ -1929,10 +1929,9 @@ void FSPanelAvatarNotes::rightsConfirmationCallback(const LLSD& notification,
}
void FSPanelAvatarNotes::confirmModifyRights(bool grant, S32 rights)
-// AO: If this is modified, also modify LLPanelAvatar::ConfirmModifyRights
{
LLSD args;
- args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+ args["NAME"] = LLSLURL("agent", getAvatarId(), "completename").getSLURLString();
if (grant)
{
diff --git a/indra/newview/fspanelradar.cpp b/indra/newview/fspanelradar.cpp
index 849b7d1c1d..d0ca7d9cf9 100644
--- a/indra/newview/fspanelradar.cpp
+++ b/indra/newview/fspanelradar.cpp
@@ -43,6 +43,7 @@
#include "llavataractions.h"
#include "llfloatersidepanelcontainer.h"
#include "llnetmap.h"
+#include "llpanelblockedlist.h"
#include "llviewercontrol.h" // for gSavedSettings
#include "llviewermenu.h" // for gMenuHolder
#include "rlvhandler.h"
@@ -190,7 +191,7 @@ void FSPanelRadar::updateButtons()
is_friend = LLAvatarTracker::instance().getBuddyInfo(selected_id) != NULL;
}
mAddFriendButton->setEnabled(!is_friend && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
- mRadarGearButton->setEnabled(selected_uuids.size() > 0);
+ mRadarGearButton->setEnabled(selected_uuids.size() > 0 && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
}
LLUUID FSPanelRadar::getCurrentItemID() const
@@ -279,15 +280,7 @@ void FSPanelRadar::onOptionsMenuItemClicked(const LLSD& userdata)
if (chosen_item == "panel_block_list_sidetray")
{
- if (gSavedSettings.getBOOL("FSUseStandaloneBlocklistFloater"))
- {
- LLFloaterReg::showInstance("fs_blocklist", LLSD());
- }
- else
- {
- LLFloaterSidePanelContainer::showPanel("people", "panel_people",
- LLSD().with("people_panel_tab_name", "blocked_panel"));
- }
+ LLPanelBlockedList::showPanelAndSelect();
}
}
diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp
index e5c63679ec..3a0f7c2075 100644
--- a/indra/newview/fsradar.cpp
+++ b/indra/newview/fsradar.cpp
@@ -509,10 +509,10 @@ void FSRadar::updateRadarList()
entry["range"] = (avRange > AVATAR_UNKNOWN_RANGE ? llformat("%3.2f", avRange) : llformat(">%3.2f", drawRadius));
entry["typing"] = (avVo && avVo->isTyping());
entry["sitting"] = (avVo && (avVo->getParent() || avVo->isMotionActive(ANIM_AGENT_SIT_GROUND) || avVo->isMotionActive(ANIM_AGENT_SIT_GROUND_CONSTRAINED)));
- entry["has_notes"] = ent->hasNotes();
if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
{
+ entry["has_notes"] = ent->hasNotes();
entry["age"] = (avAge > -1 ? llformat("%d", avAge) : "");
if (ent->hasAlertAge())
{
@@ -531,6 +531,7 @@ void FSRadar::updateRadarList()
}
else
{
+ entry["has_notes"] = false;
entry["age"] = "---";
}
diff --git a/indra/newview/fswsassetblacklist.cpp b/indra/newview/fswsassetblacklist.cpp
index aa12ae59c8..d0d3bed04d 100644
--- a/indra/newview/fswsassetblacklist.cpp
+++ b/indra/newview/fswsassetblacklist.cpp
@@ -53,6 +53,9 @@ LLAssetType::EType S32toAssetType(S32 assetindex)
case 6:
type = LLAssetType::AT_OBJECT;
break;
+ case 45:
+ type = LLAssetType::AT_PERSON;
+ break;
default:
type = LLAssetType::AT_NONE;
}
diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index 62435e677e..d8308da328 100755
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -140,9 +140,14 @@ ATI Radeon HD 8600D/G/M .*ATI.*AMD Radeon.* (HD|HD )86..[DGM].* 4 1 0 4.2
ATI Radeon HD 8700D/G/M .*ATI.*AMD Radeon.* (HD|HD )87..[DGM].* 4 1 0 4.2
ATI Radeon HD 8800D/G/M .*ATI.*AMD Radeon.* (HD|HD )88..[DGM].* 4 1 0 4.2
ATI Radeon HD 8900D/G/M .*ATI.*AMD Radeon.* (HD|HD )89..[DGM].* 4 1 0 4.2
+ATI Radeon R2 Mobile Series .*ATI.*AMD Radeon.* R2 M2\d\d.* 2 1 0 4.2
+ATI Radeon R3 Mobile Series .*ATI.*AMD Radeon.* R3 M2\d\d.* 3 1 0 4.2
+ATI Radeon R4 Mobile Series .*ATI.*AMD Radeon.* R4 M2\d\d.* 3 1 0 4.2
ATI Radeon R5 Mobile Series .*ATI.*AMD Radeon.* R5 M2\d\d.* 3 1 0 4.2
+ATI Radeon R6 Mobile Series .*ATI.*AMD Radeon.* R6 M2\d\d.* 3 1 0 4.2
ATI Radeon R7 Mobile Series .*ATI.*AMD Radeon.* R7 M2\d\d.* 4 1 0 4.2
-ATI Radeon R9 Mobile Series .*ATI.*AMD Radeon.* R9 M2\d\d.* 4 1 0 4.2
+ATI Radeon R8 Mobile Series .*ATI.*AMD Radeon.* R8 M2\d\d.* 4 1 0 4.2
+ATI Radeon R9 Mobile Series .*ATI.*AMD Radeon.* R9 M2\d\d.* 5 1 0 4.2
AMD Radeon R5(TM) OEM Mobile Series .*ATI.*AMD Radeon\(TM\).* R5 .* 3 1 0 4.2
AMD Radeon R7(TM) OEM Mobile Series .*ATI.*AMD Radeon\(TM\).* R7 .* 4 1 0 4.2
AMD Radeon R9(TM) OEM Mobile Series .*ATI.*AMD Radeon\(TM\).* R9 .* 4 1 0 4.2
@@ -204,10 +209,17 @@ ATI Radeon HD 8600 (OEM) .*ATI.*(Radeon|ASUS).* (HD|HD |EAH)86.* 3 1 0 4.2
ATI Radeon HD 8700 (OEM) .*ATI.*(Radeon|ASUS).* (HD|HD |EAH)87.* 4 1 1 4.2
ATI Radeon HD 8800 (OEM) .*ATI.*(Radeon|ASUS).* (HD|HD |EAH)88.* 5 1 1 4.2
ATI Radeon HD 8900 (OEM) .*ATI.*(Radeon|ASUS).* (HD|HD |EAH)89.* 5 1 1 4.2
-AMD Radeon R3 Series .*ATI.*(Radeon|ASUS).* R3.* 3 1 0 4.2
AMD Radeon R5 200 Series .*ATI.*(Radeon|ASUS).* R5 2[0-9].* 3 1 0 4.2
AMD Radeon R7 200 Series .*ATI.*(Radeon|ASUS).* R7 2[0-9].* 4 1 0 4.2
AMD Radeon R9 200 Series .*ATI.*(Radeon|ASUS).* R9 2[0-9].* 5 1 0 4.2
+AMD Radeon R2 Series .*ATI.*(Radeon|ASUS).* R2.* 2 1 0 4.2
+AMD Radeon R3 Series .*ATI.*(Radeon|ASUS).* R3.* 3 1 0 4.2
+AMD Radeon R4 Series .*ATI.*(Radeon|ASUS).* R4.* 3 1 0 4.2
+AMD Radeon R5 Series .*ATI.*(Radeon|ASUS).* R5.* 3 1 0 4.2
+AMD Radeon R6 Series .*ATI.*(Radeon|ASUS).* R6.* 3 1 0 4.2
+AMD Radeon R7 Series .*ATI.*(Radeon|ASUS).* R7.* 4 1 0 4.2
+AMD Radeon R8 Series .*ATI.*(Radeon|ASUS).* R8.* 4 1 0 4.2
+AMD Radeon R9 Series .*ATI.*(Radeon|ASUS).* R9.* 4 1 0 4.2
ATI Radeon OpenGL .*ATI.*Radeon OpenGL.* 0 0 0 0
ATI Radeon 2100 .*ATI.*Radeon 21.. 0 0 1 2.1
ATI Radeon 3000 .*ATI.*Radeon 30.. 0 0 1 4
@@ -469,6 +481,9 @@ NVIDIA GTX 850M .*NVIDIA .*GTX *85[0-9]M.* 5 1 0 4.4
NVIDIA GTX 860M .*NVIDIA .*GTX *86[0-9]M.* 5 1 0 4.4
NVIDIA GTX 870M .*NVIDIA .*GTX *87[0-9]M.* 5 1 0 4.4
NVIDIA GTX 880M .*NVIDIA .*GTX *88[0-9]M.* 5 1 0 4.4
+NVIDIA GTX 960M .*NVIDIA .*GTX *96[0-9]M.* 5 1 0 4.4
+NVIDIA GTX 970M .*NVIDIA .*GTX *97[0-9]M.* 5 1 0 4.4
+NVIDIA GTX 980M .*NVIDIA .*GTX *98[0-9]M.* 5 1 0 4.4
NVIDIA G100 .*NVIDIA .*G10.* 3 1 1 3.3
NVIDIA GT 120 .*NVIDIA .*GT 12.* 2 1 0 3.3
NVIDIA GT 130 .*NVIDIA .*GT 13.* 2 1 0 3.3
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 854fa1e482..1436733aaa 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4389,6 +4389,10 @@ void LLAgent::restartFailedTeleportRequest()
void LLAgent::clearTeleportRequest()
{
+ if(LLVoiceClient::instanceExists())
+ {
+ LLVoiceClient::getInstance()->setHidden(FALSE);
+ }
mTeleportRequest.reset();
}
@@ -4407,6 +4411,10 @@ bool LLAgent::hasPendingTeleportRequest()
void LLAgent::startTeleportRequest()
{
+ if(LLVoiceClient::instanceExists())
+ {
+ LLVoiceClient::getInstance()->setHidden(TRUE);
+ }
if (hasPendingTeleportRequest())
{
if (!isMaturityPreferenceSyncedWithServer())
@@ -4452,6 +4460,11 @@ void LLAgent::handleTeleportFinished()
void LLAgent::handleTeleportFailed()
{
+ if(LLVoiceClient::instanceExists())
+ {
+ LLVoiceClient::getInstance()->setHidden(FALSE);
+ }
+
if (mTeleportRequest != NULL)
{
mTeleportRequest->setStatus(LLTeleportRequest::kFailed);
diff --git a/indra/newview/llagentlanguage.cpp b/indra/newview/llagentlanguage.cpp
index 16af26eb5b..d96e63e559 100755
--- a/indra/newview/llagentlanguage.cpp
+++ b/indra/newview/llagentlanguage.cpp
@@ -40,6 +40,7 @@ void LLAgentLanguage::init()
gSavedSettings.getControl("InstallLanguage")->getSignal()->connect(boost::bind(&onChange));
gSavedSettings.getControl("SystemLanguage")->getSignal()->connect(boost::bind(&onChange));
gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&onChange));
+ gSavedSettings.getControl("LanguageIsPublic")->getSignal()->connect(boost::bind(&update)); // Make change instant
}
// static
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index 91420f6b7e..e1955e6fe8 100755
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -137,7 +137,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
region_name = RlvStrings::getString(RLV_STRING_HIDDEN_REGION);
if (LOCATION_FORMAT_NO_MATURITY == fmt)
fmt = LOCATION_FORMAT_LANDMARK;
- else if (LOCATION_FORMAT_FULL == fmt)
+ else if (LOCATION_FORMAT_FULL == fmt || LOCATION_FORMAT_V1_STATUSBAR == fmt)
fmt = LOCATION_FORMAT_NO_COORDS;
}
// [/RLVa:KB]
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f4aab9b972..c4324db135 100755
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3384,6 +3384,17 @@ bool LLAppViewer::initConfiguration()
gLastRunVersion = gSavedSettings.getString("LastRunVersion");
loadColorSettings();
+
+ // One time fix for Latency
+ if ((gLastRunVersion != LLVersionInfo::getChannelAndVersion()) && (gSavedSettings.getString("SkinCurrent") == "latency") && !gSavedSettings.getBOOL("FSLatencyOneTimeFixRun"))
+ {
+ LL_INFOS() << "FSLatencyOneTimeFix: Fixing script dialog colors." << LL_ENDL;
+ // Replace previously saved script dialog colors with new defaults, which happen to be the same as the group notice colors
+ LLUIColorTable::instance().setColor("ScriptDialog", LLUIColorTable::instance().getColor("GroupNotifyDialogBG", LLColor4::grey4));
+ LLUIColorTable::instance().setColor("ScriptDialogFg", LLUIColorTable::instance().getColor("GroupNotifyTextColor", LLColor4::white));
+ }
+ gSavedSettings.setBOOL("FSLatencyOneTimeFixRun", TRUE);
+ //
// Let anyone else who cares know that we've populated our settings
// variables.
@@ -3711,19 +3722,22 @@ bool LLAppViewer::initWindow()
LL_INFOS("AppInit") << "gViewerwindow created." << LL_ENDL;
// Need to load feature table before cheking to start watchdog.
- bool use_watchdog = false;
- int watchdog_enabled_setting = gSavedSettings.getS32("WatchdogEnabled");
- if (watchdog_enabled_setting == -1)
- {
- use_watchdog = !LLFeatureManager::getInstance()->isFeatureAvailable("WatchdogDisabled");
- }
- else
- {
- // The user has explicitly set this setting; always use that value.
- use_watchdog = bool(watchdog_enabled_setting);
- }
+ // Fix Watchdog settings/feature table mess
+ //bool use_watchdog = false;
+ //int watchdog_enabled_setting = gSavedSettings.getS32("WatchdogEnabled");
+ //if (watchdog_enabled_setting == -1)
+ //{
+ // use_watchdog = !LLFeatureManager::getInstance()->isFeatureAvailable("WatchdogDisabled");
+ //}
+ //else
+ //{
+ // // The user has explicitly set this setting; always use that value.
+ // use_watchdog = bool(watchdog_enabled_setting);
+ //}
- if (use_watchdog)
+ //if (use_watchdog)
+ if (gSavedSettings.getBOOL("WatchdogEnabled"))
+ //
{
LLWatchdog::getInstance()->init(watchdog_killer_callback);
}
@@ -5691,7 +5705,10 @@ void LLAppViewer::idle()
// Handle the regular UI idle callbacks as well as
// hover callbacks
//
-
+
+#ifdef LL_DARWIN
+ if (!mQuitRequested) //MAINT-4243
+#endif
{
// LL_RECORD_BLOCK_TIME(FTM_IDLE_CB);
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 12bf22f970..bb7a7041bd 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -425,14 +425,25 @@ void LLAppViewerWin32::disableWinErrorReporting()
HINSTANCE fault_rep_dll_handle = LoadLibrary(L"faultrep.dll"); /* Flawfinder: ignore */
if( fault_rep_dll_handle )
{
- pfn_ADDEREXCLUDEDAPPLICATIONA pAddERExcludedApplicationA = (pfn_ADDEREXCLUDEDAPPLICATIONA) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationA");
- if( pAddERExcludedApplicationA )
+ // Use unicode version
+ //pfn_ADDEREXCLUDEDAPPLICATIONA pAddERExcludedApplicationA = (pfn_ADDEREXCLUDEDAPPLICATIONA) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationA");
+ //if( pAddERExcludedApplicationA )
+ //{
+
+ // // Strip the path off the name
+ // const char* executable_name = gDirUtilp->getExecutableFilename().c_str();
+
+ // if( 0 == pAddERExcludedApplicationA( executable_name ) )
+ pfn_ADDEREXCLUDEDAPPLICATIONW pAddERExcludedApplicationW = (pfn_ADDEREXCLUDEDAPPLICATIONW) GetProcAddress(fault_rep_dll_handle, "AddERExcludedApplicationW");
+ if( pAddERExcludedApplicationW )
{
// Strip the path off the name
- const char* executable_name = gDirUtilp->getExecutableFilename().c_str();
+ std::string executable_name = gDirUtilp->getExecutableFilename();
+ llutf16string wstr = utf8str_to_utf16str(executable_name);
- if( 0 == pAddERExcludedApplicationA( executable_name ) )
+ if( 0 == pAddERExcludedApplicationW( wstr.c_str() ) )
+ //
{
U32 error_code = GetLastError();
LL_INFOS() << "AddERExcludedApplication() failed with error code " << error_code << LL_ENDL;
@@ -465,8 +476,8 @@ void LLAppViewerWin32::disableWinErrorReporting()
if( pAddERExcludedApplicationW )
{
// Strip the path off the name
- const char* executable_name = gDirUtilp->getExecutableFilename().c_str();
- std::wstring wstr(executable_name, executable_name+strlen(executable_name));
+ std::string executable_name = gDirUtilp->getExecutableFilename();
+ llutf16string wstr = utf8str_to_utf16str(executable_name);
if( S_OK == pAddERExcludedApplicationW( wstr.c_str(), FALSE ) )
{
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index 9937716030..8da86d6f9b 100755
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -570,9 +570,10 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content)
}
}
// Client LSL Bridge
- if (FSLSLBridge::instance().canUseBridge())
+ FSLSLBridge& fs_bridge = FSLSLBridge::instance();
+ if (fs_bridge.canUseBridge() && fs_bridge.getBridgeCreating())
{
- FSLSLBridge::instance().checkBridgeScriptName(mFileName);
+ fs_bridge.checkBridgeScriptName(mFileName);
}
//
break;
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index d07eabb846..e3c1eaf2a9 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -2148,7 +2148,7 @@ void LLAvatarActions::onDerenderAvatarNameLookup(const LLUUID& agent_id, const L
{
if (permanent)
{
- FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(agent_id, av_name.getUserName(), "", LLAssetType::AT_OBJECT);
+ FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(agent_id, av_name.getUserName(), "", LLAssetType::AT_PERSON);
}
LLViewerObject* av_obj = gObjectList.findObject(agent_id);
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp
index 05a413f1a9..6fa92ed7b6 100755
--- a/indra/newview/llavatarlistitem.cpp
+++ b/indra/newview/llavatarlistitem.cpp
@@ -1122,7 +1122,9 @@ void LLAvatarListItem::confirmModifyRights(bool grant, S32 rights)
// Same as llpanelavatar::confirmModifyRights
{
LLSD args;
- args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+ // Always show complete name in rights confirmation dialogs
+ //args["NAME"] = LLSLURL("agent", getAvatarId(), "displayname").getSLURLString();
+ args["NAME"] = LLSLURL("agent", getAvatarId(), "completename").getSLURLString();
if (grant)
{
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index 9e30a26042..be2776fd30 100755
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -706,7 +706,9 @@ void LLAvatarTracker::processChange(LLMessageSystem* msg)
if((mBuddyInfo[agent_id]->getRightsGrantedFrom() ^ new_rights) & LLRelationship::GRANT_MODIFY_OBJECTS)
{
LLSD args;
- args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();
+ // Always show complete name in rights dialogs
+ //args["NAME"] = LLSLURL("agent", agent_id, "displayname").getSLURLString();
+ args["NAME"] = LLSLURL("agent", agent_id, "completename").getSLURLString();
LLSD payload;
payload["from_id"] = agent_id;
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index 77e1ed7f31..20c1c4952c 100755
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1681,11 +1681,11 @@ void LLDrawPoolAvatar::updateRiggedFaceVertexBuffer(LLVOAvatar* avatar, LLFace*
{
LLPointer cur_buffer = facep->getVertexBuffer();
const LLVolumeFace& cur_vol_face = volume->getVolumeFace(i);
- if( cur_vol_face.mNumVertices > 0x10000 || cur_vol_face.mNumVertices < 0 || cur_vol_face.mNumIndices < 0 )
- {
- LL_WARNS() << "Skipping face " << i
- << " vertices " << cur_vol_face.mNumVertices << " indices " << cur_vol_face.mNumIndices
- << " face is possibly corrupted"
+ if( cur_vol_face.mNumVertices > 0x10000 || cur_vol_face.mNumVertices < 0 || cur_vol_face.mNumIndices < 0 )
+ {
+ LL_WARNS() << "Skipping face " << i
+ << " vertices " << cur_vol_face.mNumVertices << " indices " << cur_vol_face.mNumIndices
+ << " face is possibly corrupted"
<< LL_ENDL;
continue;
}
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 10fd4a9c47..0250a871c3 100755
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -954,6 +954,23 @@ LLVector2 LLFace::surfaceToTexture(LLVector2 surface_coord, const LLVector4a& po
void LLFace::getPlanarProjectedParams(LLQuaternion* face_rot, LLVector3* face_pos, F32* scale) const
{
const LLMatrix4& vol_mat = getWorldMatrix();
+ if( ! getViewerObject() )
+ {
+ LL_WARNS() << "No viewer object" << LL_ENDL;
+ return;
+ }
+ if( ! getViewerObject()->getVolume() )
+ {
+ LL_WARNS() << "No volume" << LL_ENDL;
+ return;
+ }
+
+ if( getViewerObject()->getVolume()->getNumVolumeFaces() <= mTEOffset )
+ {
+ LL_WARNS() << "No volume face" << (S32)mTEOffset << LL_ENDL;
+ return;
+ }
+
const LLVolumeFace& vf = getViewerObject()->getVolume()->getVolumeFace(mTEOffset);
const LLVector4a& normal4a = vf.mNormals[0];
const LLVector4a& tangent = vf.mTangents[0];
diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp
index 1b1f1189d7..5d5050103c 100755
--- a/indra/newview/llfasttimerview.cpp
+++ b/indra/newview/llfasttimerview.cpp
@@ -256,6 +256,14 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask)
bar_index < end_index;
++bar_index)
{
+ // FIRE-14600: mBars might be null here
+ if (!row.mBars)
+ {
+ LL_WARNS() << "Skipping null row bars" << LL_ENDL;
+ continue;
+ }
+ //
+
TimerBar& bar = row.mBars[bar_index];
if (bar.mSelfStart > mouse_time_offset)
{
diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index bc7f14a39d..8c29e6b77e 100755
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -422,13 +422,71 @@ bool LLFeatureManager::parseFeatureTable(std::string filename)
return parse_ok;
}
+F32 gpu_benchmark();
+
bool LLFeatureManager::loadGPUClass()
{
- // defaults
- mGPUClass = GPU_CLASS_UNKNOWN;
- mGPUString = gGLManager.getRawGLString();
- mGPUSupported = FALSE;
+ //get memory bandwidth from benchmark
+ F32 gbps = gpu_benchmark();
+ if (gbps < 0.f)
+ { //couldn't bench, use GLVersion
+#if LL_DARWIN
+ //GLVersion is misleading on OSX, just default to class 3 if we can't bench
+ mGPUClass = GPU_CLASS_3;
+#else
+ if (gGLManager.mGLVersion < 2.f)
+ {
+ mGPUClass = GPU_CLASS_0;
+ }
+ else if (gGLManager.mGLVersion < 3.f)
+ {
+ mGPUClass = GPU_CLASS_1;
+ }
+ else if (gGLManager.mGLVersion < 3.3f)
+ {
+ mGPUClass = GPU_CLASS_2;
+ }
+ else if (gGLManager.mGLVersion < 4.f)
+ {
+ mGPUClass = GPU_CLASS_3;
+ }
+ else
+ {
+ mGPUClass = GPU_CLASS_4;
+ }
+#endif
+ }
+ else if (gbps < 5.f)
+ {
+ mGPUClass = GPU_CLASS_0;
+ }
+ else if (gbps < 10.f)
+ {
+ mGPUClass = GPU_CLASS_1;
+ }
+ else if (gbps < 20.f)
+ {
+ mGPUClass = GPU_CLASS_2;
+ }
+ else if (gbps < 40.f)
+ {
+ mGPUClass = GPU_CLASS_3;
+ }
+ else if (gbps < 80.f)
+ {
+ mGPUClass = GPU_CLASS_4;
+ }
+ else
+ {
+ mGPUClass = GPU_CLASS_5;
+ }
+
+ // defaults
+ mGPUString = gGLManager.getRawGLString();
+ mGPUSupported = TRUE;
+
+#if 0
// first table is in the app dir
std::string app_path = gDirUtilp->getAppRODataDir();
app_path += gDirUtilp->getDirDelimiter();
@@ -456,8 +514,8 @@ bool LLFeatureManager::loadGPUClass()
{
parse_ok = parseGPUTable(app_path);
}
-
- return parse_ok; // indicates that the file parsed correctly, not that the gpu was recognized
+#endif
+ return true; // indicates that the file parsed correctly, not that the gpu was recognized
}
@@ -778,6 +836,7 @@ void LLFeatureManager::init()
void LLFeatureManager::applyRecommendedSettings()
{
+ loadGPUClass();
// apply saved settings
// cap the level at 2 (high)
U32 level = llmax(GPU_CLASS_0, llmin(mGPUClass, GPU_CLASS_5));
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 14cecb48d7..5dd38e83dc 100755
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -65,6 +65,9 @@
//put it back as a member once the legacy path is out?
static std::map sAvatarNameMap;
+// FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+LLFloaterAvatarPicker::query_id_name_map_t LLFloaterAvatarPicker::sQueryNameMap;
+
LLFloaterAvatarPicker* LLFloaterAvatarPicker::show(select_callback_t callback,
BOOL allow_multiple,
BOOL closeOnSelect,
@@ -219,6 +222,14 @@ LLFloaterAvatarPicker::~LLFloaterAvatarPicker()
}
//
+ // FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+ query_id_name_map_t::iterator found = sQueryNameMap.find(mQueryID);
+ if (found != sQueryNameMap.end())
+ {
+ sQueryNameMap.erase(found);
+ }
+ //
+
gFocusMgr.releaseFocusIfNeeded( this );
}
@@ -649,6 +660,9 @@ void LLFloaterAvatarPicker::find()
}
else
{
+ // FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+ sQueryNameMap[mQueryID] = getKey().asString();
+
LLMessageSystem* msg = gMessageSystem;
msg->newMessage("AvatarPickerRequest");
msg->nextBlock("AgentData");
@@ -775,7 +789,17 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void*
// Not for us
if (agent_id != gAgent.getID()) return;
- LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance("avatar_picker");
+ // FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+ //LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance("avatar_picker");
+ query_id_name_map_t::iterator found = sQueryNameMap.find(query_id);
+ if (found == sQueryNameMap.end())
+ {
+ return;
+ }
+ const LLSD floater_key(found->second);
+ sQueryNameMap.erase(found);
+ LLFloaterAvatarPicker* floater = LLFloaterReg::findTypedInstance("avatar_picker", floater_key);
+ //
// floater is closed or these are not results from our last request
if (NULL == floater || query_id != floater->mQueryID)
diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h
index 565fb15e3d..38ef55ecee 100755
--- a/indra/newview/llfloateravatarpicker.h
+++ b/indra/newview/llfloateravatarpicker.h
@@ -68,6 +68,11 @@ public:
void openFriendsTab();
BOOL isExcludeAgentFromSearchResults() {return mExcludeAgentFromSearchResults;}
+ // FIRE-15194: Avatar picker doesn't work anymore when using legacy simulator messages
+ typedef std::map query_id_name_map_t;
+ static query_id_name_map_t sQueryNameMap;
+ //
+
private:
void editKeystroke(class LLLineEditor* caller, void* user_data);
// Search by UUID
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp
index 13e54d2c02..f3e6ce6f9f 100755
--- a/indra/newview/llfloatercamera.cpp
+++ b/indra/newview/llfloatercamera.cpp
@@ -661,15 +661,18 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param)
// if (camera_floater)
// camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
// }
- else if ("object_view" == name && camera_floater)
+ else if ("object_view" == name)
{
- if (camera_floater->mUseFlatUI)
+ if (camera_floater)
{
- camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
- }
- else
- {
- camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+ if (camera_floater->mUseFlatUI)
+ {
+ camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+ }
+ else
+ {
+ camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+ }
}
}
//
@@ -699,15 +702,18 @@ void LLFloaterCamera::onClickCameraItem(const LLSD& param)
{
gAgentCamera.changeCameraToMouselook();
}
- else if ("object_view" == name && camera_floater)
+ else if ("object_view" == name)
{
- if (camera_floater->mUseFlatUI)
+ if (camera_floater)
{
- camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
- }
- else
- {
- camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+ if (camera_floater->mUseFlatUI)
+ {
+ camera_floater->mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA ? camera_floater->switchMode(CAMERA_CTRL_MODE_PAN) : camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+ }
+ else
+ {
+ camera_floater->switchMode(CAMERA_CTRL_MODE_FREE_CAMERA);
+ }
}
}
else
diff --git a/indra/newview/llfloatergroupbulkban.cpp b/indra/newview/llfloatergroupbulkban.cpp
new file mode 100644
index 0000000000..44074047a7
--- /dev/null
+++ b/indra/newview/llfloatergroupbulkban.cpp
@@ -0,0 +1,134 @@
+/**
+* @file llfloatergroupbulkban.cpp
+* @brief Floater to ban Residents from a group.
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatergroupbulkban.h"
+#include "llpanelgroupbulkban.h"
+#include "lltrans.h"
+#include "lldraghandle.h"
+
+
+class LLFloaterGroupBulkBan::impl
+{
+public:
+ impl(const LLUUID& group_id) : mGroupID(group_id), mBulkBanPanelp(NULL) {}
+ ~impl() {}
+
+ static void closeFloater(void* data);
+
+public:
+ LLUUID mGroupID;
+ LLPanelGroupBulkBan* mBulkBanPanelp;
+
+ static std::map sInstances;
+};
+
+//
+// Globals
+//
+std::map LLFloaterGroupBulkBan::impl::sInstances;
+
+void LLFloaterGroupBulkBan::impl::closeFloater(void* data)
+{
+ LLFloaterGroupBulkBan* floaterp = (LLFloaterGroupBulkBan*)data;
+ if(floaterp)
+ floaterp->closeFloater();
+}
+
+//-----------------------------------------------------------------------------
+// Implementation
+//-----------------------------------------------------------------------------
+LLFloaterGroupBulkBan::LLFloaterGroupBulkBan(const LLUUID& group_id/*=LLUUID::null*/)
+ : LLFloater(group_id)
+{
+ S32 floater_header_size = getHeaderHeight();
+ LLRect contents;
+
+ mImpl = new impl(group_id);
+ mImpl->mBulkBanPanelp = new LLPanelGroupBulkBan(group_id);
+
+ contents = mImpl->mBulkBanPanelp->getRect();
+ contents.mTop -= floater_header_size;
+
+ setTitle(mImpl->mBulkBanPanelp->getString("GroupBulkBan"));
+ mImpl->mBulkBanPanelp->setCloseCallback(impl::closeFloater, this);
+ mImpl->mBulkBanPanelp->setRect(contents);
+
+ addChild(mImpl->mBulkBanPanelp);
+}
+
+LLFloaterGroupBulkBan::~LLFloaterGroupBulkBan()
+{
+ if(mImpl->mGroupID.notNull())
+ {
+ impl::sInstances.erase(mImpl->mGroupID);
+ }
+
+ delete mImpl->mBulkBanPanelp;
+ delete mImpl;
+}
+
+void LLFloaterGroupBulkBan::showForGroup(const LLUUID& group_id, uuid_vec_t* agent_ids)
+{
+ const LLFloater::Params& floater_params = LLFloater::getDefaultParams();
+ S32 floater_header_size = floater_params.header_height;
+ LLRect contents;
+
+ // Make sure group_id isn't null
+ if (group_id.isNull())
+ {
+ LL_WARNS() << "LLFloaterGroupInvite::showForGroup with null group_id!" << LL_ENDL;
+ return;
+ }
+
+ // If we don't have a floater for this group, create one.
+ LLFloaterGroupBulkBan* fgb = get_if_there(impl::sInstances,
+ group_id,
+ (LLFloaterGroupBulkBan*)NULL);
+ if (!fgb)
+ {
+ fgb = new LLFloaterGroupBulkBan(group_id);
+ contents = fgb->mImpl->mBulkBanPanelp->getRect();
+ contents.mTop += floater_header_size;
+ fgb->setRect(contents);
+ fgb->getDragHandle()->setRect(contents);
+ fgb->getDragHandle()->setTitle(fgb->mImpl->mBulkBanPanelp->getString("GroupBulkBan"));
+
+ impl::sInstances[group_id] = fgb;
+
+ fgb->mImpl->mBulkBanPanelp->clear();
+ }
+
+ if (agent_ids != NULL)
+ {
+ fgb->mImpl->mBulkBanPanelp->addUsers(*agent_ids);
+ }
+
+ fgb->center();
+ fgb->openFloater();
+ fgb->mImpl->mBulkBanPanelp->update();
+}
diff --git a/indra/newview/llfloatergroupbulkban.h b/indra/newview/llfloatergroupbulkban.h
new file mode 100644
index 0000000000..5b680a1ba4
--- /dev/null
+++ b/indra/newview/llfloatergroupbulkban.h
@@ -0,0 +1,48 @@
+/**
+* @file llfloatergroupbulkban.h
+* @brief This floater is a wrapper for LLPanelGroupBulkBan, which
+* is used to ban Residents from a specific group.
+*
+* $LicenseInfo:firstyear=2013&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2013, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+* $/LicenseInfo$
+*/
+
+#ifndef LL_LLFLOATERGROUPBULKBAN_H
+#define LL_LLFLOATERGROUPBULKBAN_H
+
+#include "llfloater.h"
+#include "lluuid.h"
+
+class LLFloaterGroupBulkBan : public LLFloater
+{
+public:
+ virtual ~LLFloaterGroupBulkBan();
+
+ static void showForGroup(const LLUUID& group_id, uuid_vec_t* agent_ids = NULL);
+
+protected:
+ LLFloaterGroupBulkBan(const LLUUID& group_id = LLUUID::null);
+
+ class impl;
+ impl* mImpl;
+};
+
+#endif // LL_LLFLOATERGROUPBULKBAN_H
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp
index eaf557d278..339d15f26e 100755
--- a/indra/newview/llfloaterimcontainer.cpp
+++ b/indra/newview/llfloaterimcontainer.cpp
@@ -1272,6 +1272,22 @@ bool LLFloaterIMContainer::enableContextMenuItem(const LLSD& userdata)
uuid_vec_t uuids;
getParticipantUUIDs(uuids);
+
+ //If there is group or ad-hoc chat in multiselection, everything needs to be disabled
+ if(uuids.size() > 1)
+ {
+ const std::set selectedItems = mConversationsRoot->getSelectionList();
+ LLConversationItem * conversationItem;
+ for(std::set::const_iterator it = selectedItems.begin(); it != selectedItems.end(); ++it)
+ {
+ conversationItem = static_cast((*it)->getViewModelItem());
+ if((conversationItem->getType() == LLConversationItem::CONV_SESSION_GROUP) || (conversationItem->getType() == LLConversationItem::CONV_SESSION_AD_HOC))
+ {
+ return false;
+ }
+ }
+ }
+
if ("conversation_log" == item)
{
return gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 0;
@@ -1376,6 +1392,10 @@ bool LLFloaterIMContainer::enableContextMenuItem(const std::string& item, uuid_v
else if ("can_call" == item)
{
return LLAvatarActions::canCall();
+ }
+ else if ("can_open_voice_conversation" == item)
+ {
+ return is_single_select && LLAvatarActions::canCall();
}
else if ("can_zoom_in" == item)
{
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index c71e1c7519..b50971b0ce 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -659,6 +659,13 @@ void LLFloaterModelPreview::disableViewOption(const std::string& option)
void LLFloaterModelPreview::loadModel(S32 lod)
{
+ // FIRE-15204: Viewer crashes when clicking "upload model" quickly twice then closing both filepickers
+ if (mModelPreview->mLoading)
+ {
+ return;
+ }
+ //
+
mModelPreview->mLoading = true;
(new LLMeshFilePicker(mModelPreview, lod))->getFile();
@@ -666,6 +673,13 @@ void LLFloaterModelPreview::loadModel(S32 lod)
void LLFloaterModelPreview::loadModel(S32 lod, const std::string& file_name, bool force_disable_slm)
{
+ // FIRE-15204: Viewer crashes when clicking "upload model" quickly twice then closing both filepickers
+ if (mModelPreview->mLoading)
+ {
+ return;
+ }
+ //
+
mModelPreview->mLoading = true;
mModelPreview->loadModel(file_name, lod, force_disable_slm);
@@ -1434,32 +1448,6 @@ LLModelLoader::LLModelLoader( std::string filename, S32 lod, LLModelPreview* pre
mJointMap["lShin"] = "mKneeLeft";
mJointMap["lFoot"] = "mFootLeft";
-// FIRE-7937 : Patch from Magus Freston - allows ALL bones including all attachment points to be weighted to mesh and animated
- mJointMap["Right_Ear"] = "Right Ear";
- mJointMap["Left_Ear"] = "Left Ear";
- mJointMap["Right_Eyeball"] = "Right Eyeball";
- mJointMap["Left_Eyeball"] = "Left Eyeball";
- mJointMap["Right_Shoulder"] = "Right Shoulder";
- mJointMap["Left_Shoulder"] = "Left Shoulder";
- mJointMap["R_Upper_Arm"] = "R Upper Arm";
- mJointMap["L_Upper_Arm"] = "L Upper Arm";
- mJointMap["R_Forearm"] = "R Forearm";
- mJointMap["L_Forearm"] = "L Forearm";
- mJointMap["Right_Hand"] = "Right Hand";
- mJointMap["Left_Hand"] = "Left Hand";
- mJointMap["Right_Pec"] = "Right Pec";
- mJointMap["Left_Pec"] = "Left Pec";
- mJointMap["Avatar_Center"] = "Avatar Center";
- mJointMap["Right_Hip"] = "Right Hip";
- mJointMap["Left_Hip"] = "Left Hip";
- mJointMap["R_Upper_Leg"] = "R Upper Leg";
- mJointMap["L_Upper_Leg"] = "L Upper Leg";
- mJointMap["R_Lower_Leg"] = "R Lower Leg";
- mJointMap["R_Lower_Leg"] = "R Lower Leg";
- mJointMap["Right_Foot"] = "Right Foot";
- mJointMap["Left_Foot"] = "Left Foot";
-// FIRE-7937 end
-
if (mPreview)
{
//only try to load from slm if viewer is configured to do so and this is the
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 90a08c7927..7bd91743f8 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -123,6 +123,7 @@
#include "lleventtimer.h"
#include "lldiriterator.h" // for populating the fonts combo
#include "llline.h"
+#include "llpanelblockedlist.h"
#include "llpanelmaininventory.h"
#include "llscrolllistctrl.h"
#include "llspellcheck.h"
@@ -2458,15 +2459,7 @@ void LLFloaterPreference::onClickBlockList()
// Optional standalone blocklist floater
//LLFloaterSidePanelContainer::showPanel("people", "panel_people",
// LLSD().with("people_panel_tab_name", "blocked_panel"));
- if (gSavedSettings.getBOOL("FSUseStandaloneBlocklistFloater"))
- {
- LLFloaterReg::showInstance("fs_blocklist", LLSD());
- }
- else
- {
- LLFloaterSidePanelContainer::showPanel("people", "panel_people",
- LLSD().with("people_panel_tab_name", "blocked_panel"));
- }
+ LLPanelBlockedList::showPanelAndSelect();
//
}
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp
index 6494c3a4f7..c6cdb3fe3a 100755
--- a/indra/newview/llfloaterregioninfo.cpp
+++ b/indra/newview/llfloaterregioninfo.cpp
@@ -2923,7 +2923,7 @@ bool LLDispatchSetEstateAccess::operator()(
if (num_banned_agents > 0
&& !(access_flags & ESTATE_ACCESS_BANNED_AGENTS))
{
- LL_WARNS() << "non-zero count for banned agents, but no corresponding flag" << LL_ENDL;
+ LL_WARNS() << "non-zero count for banned residents, but no corresponding flag" << LL_ENDL;
}
if (num_estate_managers > 0
&& !(access_flags & ESTATE_ACCESS_MANAGERS))
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp
index 80a2020677..0faabce9e9 100755
--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -178,6 +178,9 @@ BOOL LLFloaterReporter::postBuild()
std::string reporter = LLSLURL("agent", gAgent.getID(), "inspect").getSLURLString();
getChild("reporter_field")->setValue(reporter);
+ // FIRE-15218: Refresh screenshot button
+ getChild("refresh_screenshot")->setCommitCallback(boost::bind(&LLFloaterReporter::takeScreenshot, this));
+
center();
return TRUE;
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 85bbb0bb13..cd7ff22bb7 100755
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -674,9 +674,16 @@ void LLFloaterTools::refresh()
getChild("selection_count")->setText(selection_info.str());
bool have_selection = !LLSelectMgr::getInstance()->getSelection()->isEmpty();
- childSetVisible("selection_count", have_selection);
- childSetVisible("remaining_capacity", have_selection);
- childSetVisible("selection_empty", !have_selection);
+ // FIRE-13838 / VWR-29517: Text and link from other tools is presented in Land tool from Build floater
+ //childSetVisible("selection_count", have_selection);
+ //childSetVisible("remaining_capacity", have_selection);
+ //childSetVisible("selection_empty", !have_selection);
+ LLTool *tool = LLToolMgr::getInstance()->getCurrentTool();
+ bool land_visible = (tool == LLToolBrushLand::getInstance() || tool == LLToolSelectLand::getInstance() );
+ childSetVisible("selection_count", !land_visible && have_selection);
+ childSetVisible("remaining_capacity", !land_visible && have_selection);
+ childSetVisible("selection_empty", !land_visible && !have_selection);
+ //
}
// disable the object and prim counts if nothing selected
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index 7339398fa5..7615c12043 100755
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -133,9 +133,9 @@ void LLFolderViewModelItemInventory::setPassedFilter(bool passed, S32 filter_gen
bool before = mPrevPassedAllFilters;
mPrevPassedAllFilters = passedFilter(filter_generation);
- if (before != mPrevPassedAllFilters)
+ if (before != mPrevPassedAllFilters)
{
- // Need to rearrange the folder if the filtered state of the item changed
+ // Need to rearrange the folder if the filtered state of the item changed
LLFolderViewFolder* parent_folder = mFolderViewItem->getParentFolder();
if (parent_folder)
{
diff --git a/indra/newview/llglsandbox.cpp b/indra/newview/llglsandbox.cpp
index 71b837c896..d0ad51eee1 100755
--- a/indra/newview/llglsandbox.cpp
+++ b/indra/newview/llglsandbox.cpp
@@ -943,13 +943,32 @@ void LLViewerObjectList::renderObjectBeacons()
}
-void gpu_benchmark()
+F32 gpu_benchmark()
{
- if (!LLGLSLShader::sNoFixedFunction)
+ if (!gGLManager.mHasShaderObjects)
{ //don't bother benchmarking the fixed function
- return;
+ return -1.f;
}
+
+ if (gBenchmarkProgram.mProgramObject == 0)
+ {
+ LLViewerShaderMgr::instance()->initAttribsAndUniforms();
+
+ gBenchmarkProgram.mName = "Benchmark Shader";
+ gBenchmarkProgram.mFeatures.attachNothing = true;
+ gBenchmarkProgram.mShaderFiles.clear();
+ gBenchmarkProgram.mShaderFiles.push_back(std::make_pair("interface/benchmarkV.glsl", GL_VERTEX_SHADER_ARB));
+ gBenchmarkProgram.mShaderFiles.push_back(std::make_pair("interface/benchmarkF.glsl", GL_FRAGMENT_SHADER_ARB));
+ gBenchmarkProgram.mShaderLevel = 1;
+ if (!gBenchmarkProgram.createShader(NULL, NULL))
+ {
+ return -1.f;
+ }
+ }
+
+ LLGLDisable blend(GL_BLEND);
+
//measure memory bandwidth by:
// - allocating a batch of textures and render targets
// - rendering those textures to those render targets
@@ -994,7 +1013,8 @@ void gpu_benchmark()
gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, source[i]);
LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_RGBA, res,res,GL_RGBA, GL_UNSIGNED_BYTE, pixels);
}
- delete [] pixels;
+
+ delete [] pixels;
//make a dummy triangle to draw with
LLPointer buff = new LLVertexBuffer(LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0, GL_STATIC_DRAW_ARB);
@@ -1016,6 +1036,8 @@ void gpu_benchmark()
//wait for any previoius GL commands to finish
glFinish();
+ bool busted_finish = false;
+
for (S32 c = -1; c < samples; ++c)
{
LLTimer timer;
@@ -1030,7 +1052,18 @@ void gpu_benchmark()
}
//wait for current batch of copies to finish
- glFinish();
+ if (busted_finish)
+ {
+ //read a pixel off the last target since some drivers seem to ignore glFinish
+ dest[count-1].bindTarget();
+ U32 pixel = 0;
+ glReadPixels(0,0,1,1,GL_RGBA, GL_UNSIGNED_BYTE, &pixel);
+ dest[count-1].flush();
+ }
+ else
+ {
+ glFinish();
+ }
F32 time = timer.getElapsedTimeF32();
@@ -1041,13 +1074,20 @@ void gpu_benchmark()
F32 gbps = gb/time;
- results.push_back(gbps);
+ if (!gGLManager.mHasTimerQuery && !busted_finish && gbps > 128.f)
+ { //unrealistically high bandwidth for a card without timer queries, glFinish is probably ignored
+ busted_finish = true;
+ }
+ else
+ {
+ results.push_back(gbps);
+ }
}
}
gBenchmarkProgram.unbind();
- LLGLSLShader::finishProfile();
+ LLGLSLShader::finishProfile(false);
LLImageGL::deleteTextures(count, source);
@@ -1057,21 +1097,32 @@ void gpu_benchmark()
F32 gbps = results[results.size()/2];
LL_INFOS() << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to CPU timers" << LL_ENDL;
-
- F32 ms = gBenchmarkProgram.mTimeElapsed/1000000.f;
- F32 seconds = ms/1000.f;
-
- F64 samples_drawn = res*res*count*samples;
- F32 samples_sec = (samples_drawn/1000000000.0)/seconds;
- gbps = samples_sec*8;
+
+#if LL_DARWIN
+ if (gbps > 512.f)
+ {
+ LL_INFOS() << "Memory bandwidth is improbably high and likely incorrect." << LL_ENDL;
+ //OSX is probably lying, discard result
+ gbps = -1.f;
+ }
+#endif
if (gGLManager.mHasTimerQuery)
{
+ F32 ms = gBenchmarkProgram.mTimeElapsed/1000000.f;
+ F32 seconds = ms/1000.f;
+
+ F64 samples_drawn = res*res*count*samples;
+ F32 samples_sec = (samples_drawn/1000000000.0)/seconds;
+ gbps = samples_sec*8;
+
LL_INFOS() << "Memory bandwidth is " << llformat("%.3f", gbps) << "GB/sec according to ARB_timer_query" << LL_ENDL;
}
else
{
LL_INFOS() << "ARB_timer_query unavailable." << LL_ENDL;
}
+
+ return gbps;
}
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index af7c630ee7..10a55dbc41 100755
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -173,7 +173,7 @@ public:
void changed(LLGroupChange gc)
{
- if (gc == GC_MEMBER_DATA && !mRequestProcessed)
+ if (gc == GC_PROPERTIES && !mRequestProcessed)
{
LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(mGroupId);
if (!gdatap)
@@ -183,9 +183,6 @@ public:
else if (!gdatap->isMemberDataComplete())
{
LL_WARNS() << "LLGroupMgr::getInstance()->getGroupData()->isMemberDataComplete() was FALSE" << LL_ENDL;
- }
- else
- {
processGroupData();
mRequestProcessed = true;
}
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 1c7e910f29..9f63706ee9 100755
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -238,11 +238,11 @@ LLGroupMgrGroupData::LLGroupMgrGroupData(const LLUUID& id) :
mMemberCount(0),
mRoleCount(0),
mReceivedRoleMemberPairs(0),
- mMemberDataComplete(FALSE),
- mRoleDataComplete(FALSE),
- mRoleMemberDataComplete(FALSE),
- mGroupPropertiesDataComplete(FALSE),
- mPendingRoleMemberRequest(FALSE),
+ mMemberDataComplete(false),
+ mRoleDataComplete(false),
+ mRoleMemberDataComplete(false),
+ mGroupPropertiesDataComplete(false),
+ mPendingRoleMemberRequest(false),
mAccessTime(0.0f)
{
mMemberVersion.generate();
@@ -431,7 +431,7 @@ void LLGroupMgrGroupData::removeMemberData()
delete mi->second;
}
mMembers.clear();
- mMemberDataComplete = FALSE;
+ mMemberDataComplete = false;
mMemberVersion.generate();
}
@@ -453,8 +453,8 @@ void LLGroupMgrGroupData::removeRoleData()
}
mRoles.clear();
mReceivedRoleMemberPairs = 0;
- mRoleDataComplete = FALSE;
- mRoleMemberDataComplete = FALSE;
+ mRoleDataComplete = false;
+ mRoleMemberDataComplete= false;
}
void LLGroupMgrGroupData::removeRoleMemberData()
@@ -478,7 +478,7 @@ void LLGroupMgrGroupData::removeRoleMemberData()
}
mReceivedRoleMemberPairs = 0;
- mRoleMemberDataComplete = FALSE;
+ mRoleMemberDataComplete= false;
}
LLGroupMgrGroupData::~LLGroupMgrGroupData()
@@ -754,6 +754,20 @@ void LLGroupMgrGroupData::cancelRoleChanges()
// Clear out all changes!
mRoleChanges.clear();
}
+
+void LLGroupMgrGroupData::createBanEntry(const LLUUID& ban_id, const LLGroupBanData& ban_data)
+{
+ mBanList[ban_id] = ban_data;
+}
+
+void LLGroupMgrGroupData::removeBanEntry(const LLUUID& ban_id)
+{
+ mBanList.erase(ban_id);
+}
+
+
+
+
//
// LLGroupMgr
//
@@ -963,12 +977,12 @@ void LLGroupMgr::processGroupMembersReply(LLMessageSystem* msg, void** data)
if (group_datap->mMembers.size() == (U32)group_datap->mMemberCount)
{
- group_datap->mMemberDataComplete = TRUE;
+ group_datap->mMemberDataComplete = true;
group_datap->mMemberRequestID.setNull();
// We don't want to make role-member data requests until we have all the members
if (group_datap->mPendingRoleMemberRequest)
{
- group_datap->mPendingRoleMemberRequest = FALSE;
+ group_datap->mPendingRoleMemberRequest = false;
LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_datap->mID);
}
}
@@ -1038,7 +1052,7 @@ void LLGroupMgr::processGroupPropertiesReply(LLMessageSystem* msg, void** data)
group_datap->mMemberCount = num_group_members;
group_datap->mRoleCount = num_group_roles + 1; // Add the everyone role.
- group_datap->mGroupPropertiesDataComplete = TRUE;
+ group_datap->mGroupPropertiesDataComplete = true;
group_datap->mChanged = TRUE;
LLGroupMgr::getInstance()->notifyObservers(GC_PROPERTIES);
@@ -1115,12 +1129,12 @@ void LLGroupMgr::processGroupRoleDataReply(LLMessageSystem* msg, void** data)
if (group_datap->mRoles.size() == (U32)group_datap->mRoleCount)
{
- group_datap->mRoleDataComplete = TRUE;
+ group_datap->mRoleDataComplete = true;
group_datap->mRoleDataRequestID.setNull();
// We don't want to make role-member data requests until we have all the role data
if (group_datap->mPendingRoleMemberRequest)
{
- group_datap->mPendingRoleMemberRequest = FALSE;
+ group_datap->mPendingRoleMemberRequest = false;
LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_datap->mID);
}
}
@@ -1229,7 +1243,7 @@ void LLGroupMgr::processGroupRoleMembersReply(LLMessageSystem* msg, void** data)
}
}
- group_datap->mRoleMemberDataComplete = TRUE;
+ group_datap->mRoleMemberDataComplete= true;
group_datap->mRoleMembersRequestID.setNull();
}
@@ -1555,7 +1569,7 @@ void LLGroupMgr::sendGroupRoleMembersRequest(const LLUUID& group_id)
LL_INFOS() << " Pending: " << (group_datap->mPendingRoleMemberRequest ? "Y" : "N")
<< " MemberDataComplete: " << (group_datap->mMemberDataComplete ? "Y" : "N")
<< " RoleDataComplete: " << (group_datap->mRoleDataComplete ? "Y" : "N") << LL_ENDL;
- group_datap->mPendingRoleMemberRequest = TRUE;
+ group_datap->mPendingRoleMemberRequest = true;
return;
}
@@ -1808,7 +1822,7 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
{
// Or check if they're listed in an active group session
LLIMSpeakerMgr* mgr = LLIMModel::instance().getSpeakerManager(LLIMMgr::computeSessionID(IM_SESSION_GROUP_START, group_id));
- if ( (!mgr) && (mgr->findSpeaker(ejected_member_id).isNull()) )
+ if ( (!mgr) || (mgr->findSpeaker(ejected_member_id).isNull()) )
{
continue;
}
@@ -1873,6 +1887,138 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id,
}
+// Responder class for capability group management
+class GroupBanDataResponder : public LLHTTPClient::Responder
+{
+public:
+ GroupBanDataResponder(const LLUUID& gropup_id, BOOL force_refresh=false);
+ virtual ~GroupBanDataResponder() {}
+ virtual void result(const LLSD& pContent);
+ virtual void errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent);
+private:
+ LLUUID mGroupID;
+ BOOL mForceRefresh;
+};
+
+GroupBanDataResponder::GroupBanDataResponder(const LLUUID& gropup_id, BOOL force_refresh) :
+ mGroupID(gropup_id),
+ mForceRefresh(force_refresh)
+{}
+
+void GroupBanDataResponder::errorWithContent(U32 pStatus, const std::string& pReason, const LLSD& pContent)
+{
+ LL_WARNS("GrpMgr") << "Error receiving group member data [status:"
+ << pStatus << "]: " << pContent << LL_ENDL;
+}
+
+void GroupBanDataResponder::result(const LLSD& content)
+{
+ if (content.has("ban_list"))
+ {
+ // group ban data received
+ LLGroupMgr::processGroupBanRequest(content);
+ }
+ else if (mForceRefresh)
+ {
+ // no ban data received, refreshing data after successful operation
+ LLGroupMgr::getInstance()->sendGroupBanRequest(LLGroupMgr::REQUEST_GET, mGroupID);
+ }
+}
+
+void LLGroupMgr::sendGroupBanRequest( EBanRequestType request_type,
+ const LLUUID& group_id,
+ U32 ban_action, /* = BAN_NO_ACTION */
+ const std::vector ban_list) /* = std::vector() */
+{
+ LLViewerRegion* currentRegion = gAgent.getRegion();
+ if(!currentRegion)
+ {
+ LL_WARNS("GrpMgr") << "Agent does not have a current region." << LL_ENDL;
+ return;
+ }
+
+ // Check to make sure we have our capabilities
+ if(!currentRegion->capabilitiesReceived())
+ {
+ LL_WARNS("GrpMgr") << " Capabilities not received!" << LL_ENDL;
+ return;
+ }
+
+ // Get our capability
+ std::string cap_url = currentRegion->getCapability("GroupAPIv1");
+ if(cap_url.empty())
+ {
+ return;
+ }
+ cap_url += "?group_id=" + group_id.asString();
+
+ LLSD body = LLSD::emptyMap();
+ body["ban_action"] = (LLSD::Integer)(ban_action & ~BAN_UPDATE);
+ // Add our list of potential banned residents to the list
+ body["ban_ids"] = LLSD::emptyArray();
+ LLSD ban_entry;
+
+ uuid_vec_t::const_iterator iter = ban_list.begin();
+ for(;iter != ban_list.end(); ++iter)
+ {
+ ban_entry = (*iter);
+ body["ban_ids"].append(ban_entry);
+ }
+
+ LLHTTPClient::ResponderPtr grp_ban_responder = new GroupBanDataResponder(group_id, ban_action & BAN_UPDATE);
+ switch(request_type)
+ {
+ case REQUEST_GET:
+ LLHTTPClient::get(cap_url, grp_ban_responder);
+ break;
+ case REQUEST_POST:
+ LLHTTPClient::post(cap_url, body, grp_ban_responder);
+ break;
+ case REQUEST_PUT:
+ case REQUEST_DEL:
+ break;
+ }
+}
+
+
+void LLGroupMgr::processGroupBanRequest(const LLSD& content)
+{
+ // Did we get anything in content?
+ if(!content.size())
+ {
+ LL_WARNS("GrpMgr") << "No group member data received." << LL_ENDL;
+ return;
+ }
+
+ LLUUID group_id = content["group_id"].asUUID();
+
+ LLGroupMgrGroupData* gdatap = LLGroupMgr::getInstance()->getGroupData(group_id);
+ if (!gdatap)
+ return;
+
+ LLSD::map_const_iterator i = content["ban_list"].beginMap();
+ LLSD::map_const_iterator iEnd = content["ban_list"].endMap();
+ for(;i != iEnd; ++i)
+ {
+ const LLUUID ban_id(i->first);
+ LLSD ban_entry(i->second);
+
+ LLGroupBanData ban_data;
+ if(ban_entry.has("ban_date"))
+ {
+ ban_data.mBanDate = ban_entry["ban_date"].asDate();
+ // TODO: Ban Reason
+ }
+
+ gdatap->createBanEntry(ban_id, ban_data);
+ }
+
+ gdatap->mChanged = TRUE;
+ LLGroupMgr::getInstance()->notifyObservers(GC_BANLIST);
+}
+
+
+
// Responder class for capability group management
class GroupMemberDataResponder : public LLHTTPClient::Responder
{
@@ -1966,7 +2112,7 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
if(num_members < 1)
return;
- LLUUID group_id = content["group_id"].asUUID();
+ LLUUID group_id = content["group_id"].asUUID();
LLGroupMgrGroupData* group_datap = LLGroupMgr::getInstance()->getGroupData(group_id);
if(!group_datap)
@@ -2049,12 +2195,12 @@ void LLGroupMgr::processCapGroupMembersRequest(const LLSD& content)
LLGroupMgr::getInstance()->sendGroupTitlesRequest(group_id);
- group_datap->mMemberDataComplete = TRUE;
+ group_datap->mMemberDataComplete = true;
group_datap->mMemberRequestID.setNull();
// Make the role-member data request
if (group_datap->mPendingRoleMemberRequest)
{
- group_datap->mPendingRoleMemberRequest = FALSE;
+ group_datap->mPendingRoleMemberRequest = false;
LLGroupMgr::getInstance()->sendGroupRoleMembersRequest(group_id);
}
diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h
index ece6a8cdbb..44a666ef0a 100755
--- a/indra/newview/llgroupmgr.h
+++ b/indra/newview/llgroupmgr.h
@@ -33,8 +33,10 @@
#include
#include