diff options
| author | Richard Linden <none@none> | 2012-07-27 14:10:48 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-07-27 14:10:48 -0700 |
| commit | d7b444686f9d5d3ebc13db6389444830369ccf3a (patch) | |
| tree | cdda60929a5a1c2f031a09de623d744712c20207 | |
| parent | f9ccd6bc9d9a1da849ac21913ff870e2db8ad6a1 (diff) | |
| parent | 3ba619053de562fc623263704af2bc2f415e8389 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui
| -rw-r--r-- | indra/newview/llconversationlog.h | 2 | ||||
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llinventorypanel.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 1 |
4 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h index 700472ca8b..18865bb80e 100644 --- a/indra/newview/llconversationlog.h +++ b/indra/newview/llconversationlog.h @@ -31,7 +31,7 @@ #include "llimview.h" class LLConversationLogObserver; -class Conversation_params; +struct Conversation_params; typedef LLIMModel::LLIMSession::SType SessionType; diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index c19683b1c2..74f089811e 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -107,6 +107,7 @@ BOOL LLIMFloaterContainer::postBuild() p.rect = mConversationsListPanel->getLocalRect(); p.follows.flags = FOLLOWS_ALL; p.listener = base_item; + p.root = NULL; mConversationsRoot = LLUICtrlFactory::create<LLFolderView>(p); mConversationsListPanel->addChild(mConversationsRoot); diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 6a7ee3b6a0..be1cd2510d 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -659,6 +659,7 @@ LLFolderView * LLInventoryPanel::createFolderView(LLInvFVBridge * bridge, bool u p.allow_multiselect = mAllowMultiSelect; p.show_empty_message = mShowEmptyMessage; p.show_item_link_overlays = mShowItemLinkOverlays; + p.root = NULL; return LLUICtrlFactory::create<LLFolderView>(p); } diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 5887f4d244..4f2c515bde 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -1563,6 +1563,7 @@ void LLPanelObjectInventory::reset() p.listener = LLTaskInvFVBridge::createObjectBridge(this, NULL); p.folder_indentation = -14; // subtract space normally reserved for folder expanders p.view_model = &mInventoryViewModel; + p.root = NULL; mFolders = LLUICtrlFactory::create<LLFolderView>(p); // this ensures that we never say "searching..." or "no items found" //TODO RN: make this happen by manipulating filter object directly |