summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIma Mechanique <none@none>2011-05-12 11:42:46 +0100
committerIma Mechanique <none@none>2011-05-12 11:42:46 +0100
commitad0cb157fe6de4ac9c2b14e74dd41fd5515c2d23 (patch)
treea4fbf9bcb9ab9a59fa04c1ce2b071253a562c597
parent510283ce83f152a01887b535f24b29cf2ee95968 (diff)
STORM-1175 Fixing close button, for Custom Port warning, in Preferences => Setup => Network.
-rw-r--r--doc/contributions.txt2
-rw-r--r--indra/llui/llnotifications.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 09fca27f43..6f168209be 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -365,6 +365,7 @@ Ian Kas
CT-325
Ima Mechanique
OPEN-61
+ STORM-1175
Irene Muni
CT-324
CT-352
@@ -448,6 +449,7 @@ Kitty Barnett
STORM-799
STORM-800
STORM-1001
+ STORM-1175
VWR-24217
Kunnis Basiat
VWR-82
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index bdac125eb0..6085c61f9a 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1532,7 +1532,7 @@ bool LLNotifications::loadVisibilityRules()
// Add a simple notification (from XUI)
void LLNotifications::addFromCallback(const LLSD& name)
{
- add(LLNotification::Params().name(name.asString()));
+ add(name.asString(), LLSD(), LLSD());
}
LLNotificationPtr LLNotifications::add(const std::string& name,