diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-18 09:48:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-18 09:48:46 -0400 |
| commit | 7713a8477797f7d1209989e9c36f78090ce9c850 (patch) | |
| tree | ea2f5a56c214f13336e229a5a1f66a396e062ff5 | |
| parent | 536bc21dac54f5403c5421a3f58004896532112f (diff) | |
| parent | ad0cb157fe6de4ac9c2b14e74dd41fd5515c2d23 (diff) | |
merge changes for storm-1175
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/llui/llnotifications.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 3b4f4de90e..ad04f5f338 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -369,6 +369,7 @@ Ian Kas Ima Mechanique OPEN-50 OPEN-61 + STORM-1175 Irene Muni CT-324 CT-352 @@ -455,6 +456,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, |