diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 9ae60ab301..052987b69f 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1014,6 +1014,7 @@ LLBoundListener LLNotificationChannelBase::connectChangedImpl(const LLEventListe
LLBoundListener LLNotificationChannelBase::connectAtFrontChangedImpl(const LLEventListener& slot)
{
+ LLMutexLock lock(&mItemsMutex); // Guard against against unlocked access to mItems
for (LLNotificationSet::iterator it = mItems.begin(); it != mItems.end(); ++it)
{
slot(LLSD().with("sigtype", "load").with("id", (*it)->id()));
@@ -1052,10 +1053,17 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload)
bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPtr pNotification)
{
std::string cmd = payload["sigtype"];
- LLNotificationSet::iterator foundItem = mItems.find(pNotification);
- bool wasFound = (foundItem != mItems.end());
+ // Guard against unlocked access to mItems
+ // LLNotificationSet::iterator foundItem = mItems.find(pNotification);
+ // bool wasFound = (foundItem != mItems.end());
+ bool wasFound = false;
+ {
+ LLMutexLock lock(&mItemsMutex);
+ LLNotificationSet::iterator foundItem = mItems.find(pNotification);
+ wasFound = (foundItem != mItems.end());
+ }
+ //
bool passesFilter = mFilter ? mFilter(pNotification) : true;
-
// first, we offer the result of the filter test to the simple
// signals for pass/fail. One of these is guaranteed to be called.
// If either signal returns true, the change processing is NOT performed
@@ -1084,6 +1092,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
assert(!wasFound);
if (passesFilter)
{
+ LLMutexLock lock(&mItemsMutex); // Guard against unlocked access to mItems
// not in our list, add it and say so
mItems.insert(pNotification);
onLoad(pNotification);
@@ -1107,6 +1116,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
}
else
{
+ LLMutexLock lock(&mItemsMutex); // Guard against unlocked access to mItems
// not in our list, add it and say so
mItems.insert(pNotification);
onChange(pNotification);
@@ -1120,6 +1130,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
{
if (wasFound)
{
+ LLMutexLock lock(&mItemsMutex); // Guard against unlocked access to mItems
// it already existed, so this is a delete
mItems.erase(pNotification);
onChange(pNotification);
@@ -1138,6 +1149,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
assert(!wasFound);
if (passesFilter)
{
+ LLMutexLock lock(&mItemsMutex); // Guard against unlocked access to mItems
// not in our list, add it and say so
mItems.insert(pNotification);
onAdd(pNotification);
@@ -1149,6 +1161,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
// if we have it in our list, pass on the delete, then delete it, else do nothing
if (wasFound)
{
+ LLMutexLock lock(&mItemsMutex); // Guard against unlocked access to mItems
onDelete(pNotification);
abortProcessing = mChanged(payload);
mItems.erase(pNotification);
@@ -1714,6 +1727,7 @@ void LLNotifications::add(const LLNotificationPtr pNotif)
if (pNotif == NULL) return;
// first see if we already have it -- if so, that's a problem
+ LLMutexLock lock(&mItemsMutex); // Guard against unlocked acceess to mItems
LLNotificationSet::iterator it=mItems.find(pNotif);
if (it != mItems.end())
{
diff --git a/indra/newview/app_settings/grids.xml b/indra/newview/app_settings/grids.xml
index 2a2e599f07..5c37cb0767 100644
--- a/indra/newview/app_settings/grids.xml
+++ b/indra/newview/app_settings/grids.xml
@@ -1,942 +1,32 @@
+ util.aditi.lindenlab.com
- grid.alifevirtual.com:8002
-
- www.alifevirtual.com:8002
-
- grid.avatarconnection.com:8002/
-
- grid.roleplayworlds.net:8002
-
- inworldz.com:8002
-
- login.avination.com/
-
- login.danger.osgrid.org
-
- reactiongrid.com:8008
-
- login.aurorascape.com:8002
-
- vidadupla.com.br:8002
-
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2f469bbd12..85a79e36d2 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -153,6 +153,17 @@
Value
http://phoenixviewer.com/app/fsdata/grids.xml
+ FSGridBuilderURL
+
LastConnectedGrid
+ FSUseLegacyUnsupportedHardwareChecks
+
FSUseStandaloneGroupFloater