From e829db8b2cfe8b3b5aa5c30ed10c934e189fd25a Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 29 Jun 2013 19:42:10 +0200 Subject: [PATCH] FS communication UI: Ifdef out llconversationmodel for now as we don't use it yet --- indra/newview/llconversationmodel.cpp | 4 ++++ indra/newview/llconversationmodel.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index c74ce24872..ea42520ffd 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -27,6 +27,8 @@ #include "llviewerprecompiledheaders.h" +#if 0 + #include "llagent.h" #include "llavatarnamecache.h" #include "llavataractions.h" @@ -700,3 +702,5 @@ void LLConversationViewModel::sort(LLFolderViewFolder* folder) } // EOF + +#endif diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index 8766585049..51bf3a2ce0 100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -24,6 +24,8 @@ * $/LicenseInfo$ */ +#if 0 + #ifndef LL_LLCONVERSATIONMODEL_H #define LL_LLCONVERSATIONMODEL_H @@ -312,3 +314,5 @@ void hide_context_entries(LLMenuGL& menu, const menuentry_vec_t &disabled_entries); #endif // LL_LLCONVERSATIONMODEL_H + +#endif \ No newline at end of file