diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-08-24 12:44:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-08-24 12:44:02 -0700 |
| commit | 1de433aa8cda814dbfd0ce51a3ec5dea111aadd0 (patch) | |
| tree | d7b384a4cc745beae59ff28cd2b295b3d2e8f17f /indra/newview | |
| parent | f6d0f9952b19c5a41a63accd3aa265b30d982853 (diff) | |
| parent | 98cc2365034a93c69704daa69efb389799cc9627 (diff) | |
Sync with viewer-development
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventoryitemslist.h | 1 | ||||
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llwearableitemslist.h | 1 |
3 files changed, 9 insertions, 0 deletions
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. |