diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-01-29 16:35:54 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-01-29 16:35:54 -0800 |
| commit | bb9dc5b14e62791a6c5f2ea536f8dd2596ad1778 (patch) | |
| tree | dbf18be80ff0341b661f86848ef17baf1d33e924 /indra/llui | |
| parent | 1de15af932742f198595b914b33a0af1dcc49894 (diff) | |
| parent | 682f8afcc073b62fed64a3fd2adc5f65793e1f3e (diff) | |
Merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/tests/llurlentry_test.cpp | 2 | ||||
| -rw-r--r-- | indra/llui/tests/llurlmatch_test.cpp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 035ca3f26b..5816cef6af 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -283,6 +283,7 @@ LLNotificationForm::LLNotificationForm(const std::string& name, const LLXMLNodeP } LLNotificationForm::LLNotificationForm(const LLSD& sd) + : mIgnore(IGNORE_NO) { if (sd.isArray()) { diff --git a/indra/llui/tests/llurlentry_test.cpp b/indra/llui/tests/llurlentry_test.cpp index 6fec1d3e10..bc97cf3df2 100644 --- a/indra/llui/tests/llurlentry_test.cpp +++ b/indra/llui/tests/llurlentry_test.cpp @@ -33,7 +33,7 @@ LLUIColor LLUIColorTable::getColor(const std::string& name, const LLColor4& defa return LLUIColor(); } -LLUIColor::LLUIColor() {} +LLUIColor::LLUIColor() : mColorPtr(NULL) {} namespace tut { diff --git a/indra/llui/tests/llurlmatch_test.cpp b/indra/llui/tests/llurlmatch_test.cpp index f9dfee931b..24a32de268 100644 --- a/indra/llui/tests/llurlmatch_test.cpp +++ b/indra/llui/tests/llurlmatch_test.cpp @@ -25,6 +25,7 @@ // link seam LLUIColor::LLUIColor() + : mColorPtr(NULL) {} namespace tut |