diff options
| author | Richard Linden <none@none> | 2012-11-19 19:06:36 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-11-19 19:06:36 -0800 |
| commit | c0224cc47a2994956f20e8f65177b60cc709e434 (patch) | |
| tree | 01d305fff69ca9cec713631d04aa76a4a33c79ca /indra/llui/llnotifications.cpp | |
| parent | 2d1a903d39a971775436ba4e1dfb7f630226c15c (diff) | |
| parent | 6db6cb39f41e921e75970d1570a74cf35d353a35 (diff) | |
merge with viewer-development
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 210a320f41..137c6efc53 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -464,7 +464,7 @@ LLNotification::LLNotification(const LLNotification::Params& p) : mTimestamp(p.time_stamp), mSubstitutions(p.substitutions), mPayload(p.payload), - mExpiresAt(0), + mExpiresAt(0.0), mTemporaryResponder(false), mRespondedTo(false), mPriority(p.priority), @@ -1433,7 +1433,7 @@ bool LLNotifications::loadTemplates() std::string base_filename = search_paths.front(); LLXMLNodePtr root; BOOL success = LLXMLNode::getLayeredXMLNode(root, search_paths); - + if (!success || root.isNull() || !root->hasName( "notifications" )) { llerrs << "Problem reading XML from UI Notifications file: " << base_filename << llendl; |