diff options
| -rw-r--r-- | BuildParams | 15 | ||||
| -rw-r--r-- | indra/llui/llflatlistview.cpp | 3 | ||||
| -rw-r--r-- | indra/llui/llflatlistview.h | 2 | ||||
| -rw-r--r-- | indra/newview/llinventoryitemslist.h | 1 | ||||
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llwearableitemslist.h | 1 |
6 files changed, 16 insertions, 13 deletions
diff --git a/BuildParams b/BuildParams index 3f5225ad49..9b5a9cfb3f 100644 --- a/BuildParams +++ b/BuildParams @@ -77,19 +77,8 @@ viewer-release.build_viewer_update_version_manager = true # aimee # ======================================== -viewer-development-import.build_Linux = true -viewer-development-import_debug.build_Linux = false - -viewer-development-import.build_Darwin = true -viewer-development-import_debug.build_Darwin = false - -viewer-development-import.build_CYGWIN = true -viewer-development-import.build_CYGWIN_Debug = false -viewer-development-import.build_CYGWIN_RelWithDebInfo = false -viewer-development-import.build_CYGWIN_Release = true -viewer-development-import_debug.build_CYGWIN_Debug = true -viewer-development-import_debug.build_CYGWIN_RelWithDebInfo = true -viewer-development-import_debug.build_CYGWIN_Release = false +viewer-development-import.build_debug_release_separately = true +viewer-development-fixes.build_debug_release_separately = true # ======================================= # brad diff --git a/indra/llui/llflatlistview.cpp b/indra/llui/llflatlistview.cpp index f266af03ee..b28399a36b 100644 --- a/indra/llui/llflatlistview.cpp +++ b/indra/llui/llflatlistview.cpp @@ -87,6 +87,9 @@ bool LLFlatListView::addItem(LLPanel * item, const LLSD& value /*= LLUUID::null* mItemsPanel->addChild(item); break; default: + LL_WARNS("") << "Unsupported position." << LL_ENDL; + delete new_pair; + return false; break; } diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h index 8667af048b..afd0176d98 100644 --- a/indra/llui/llflatlistview.h +++ b/indra/llui/llflatlistview.h @@ -54,6 +54,7 @@ */ class LLFlatListView : public LLScrollContainer, public LLEditMenuHandler { + LOG_CLASS(LLFlatListView); public: /** @@ -448,6 +449,7 @@ private: */ class LLFlatListViewEx : public LLFlatListView { + LOG_CLASS(LLFlatListViewEx); public: struct Params : public LLInitParam::Block<Params, LLFlatListView::Params> { diff --git a/indra/newview/llinventoryitemslist.h b/indra/newview/llinventoryitemslist.h index 17131549e7..ca90427659 100644 --- a/indra/newview/llinventoryitemslist.h +++ b/indra/newview/llinventoryitemslist.h @@ -38,6 +38,7 @@ class LLViewerInventoryItem; class LLInventoryItemsList : public LLFlatListViewEx { + LOG_CLASS(LLInventoryItemsList); public: struct Params : public LLInitParam::Block<Params, LLFlatListViewEx::Params> { diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index 15729b5175..2e003dd2b8 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -7111,6 +7111,13 @@ void LLVivoxProtocolParser::reset() alias.clear(); numberOfAliases = 0; applicationString.clear(); + id = 0; + nameString.clear(); + descriptionString.clear(); + expirationDate = LLDate(); + hasExpired = false; + fontType = 0; + fontStatus = 0; } //virtual diff --git a/indra/newview/llwearableitemslist.h b/indra/newview/llwearableitemslist.h index 4806fb35bf..854c37c2c1 100644 --- a/indra/newview/llwearableitemslist.h +++ b/indra/newview/llwearableitemslist.h @@ -384,6 +384,7 @@ private: */ class LLWearableItemsList : public LLInventoryItemsList { + LOG_CLASS(LLWearableItemsList); public: /** * Context menu. |