Broken: relog sometimes works once; fixed inventory and avatar not ruthed anymore.

	deleted:    Imprudence.log
	modified:   linden/indra/newview/llagent.cpp
	modified:   linden/indra/newview/llappviewer.cpp
	modified:   linden/indra/newview/llinventorymodel.cpp
	modified:   linden/indra/newview/llinventorymodel.h
	modified:   linden/indra/newview/llinventoryview.cpp
	modified:   linden/indra/newview/llviewerjointattachment.h
	modified:   linden/indra/newview/llviewermenu.cpp
	deleted:    mAttachedObject.diff.txt
	deleted:    meerkat-llmenugl.diff.txt
	deleted:    meerkat-message.diff.txt
	deleted:    meerkat-pipeline.cpp.diff.txt
	deleted:    meerkat-voice.diff.txt
	deleted:    stack_trace.log

1 files changed, 4 insertions, 2 deletions

diff --git a/linden/indra/newview/llinventorymodel.h b/linden/indra/newview/llinventorymodel.h
index 7c7d231..e95d246 100644
--- a/linden/indra/newview/llinventorymodel.h
+++ b/linden/indra/newview/llinventorymodel.h
@@ -323,6 +323,8 @@ public:
         // relations.
         void buildParentChildMap();
 
+        // Empty the entire contents
+        void empty();
         //
         // Category accounting.
         //
@@ -374,6 +376,7 @@ public:
         static bool isEverythingFetched();
         static void backgroundFetch(void*); // background fetch idle function
         static void incrBulkFetch(S16 fetching) {  sBulkFetchCount+=fetching; if (sBulkFetchCount<0) sBulkFetchCount=0; }
+
 protected:
 
         // Internal methods which add inventory and make sure that all of
@@ -387,8 +390,7 @@ protected:
         // preferred type. Returns LLUUID::null if not found
         LLUUID findCatUUID(LLAssetType::EType preferred_type);
 
-        // Empty the entire contents
-        void empty();
+
 
         // Given the current state of the inventory items, figure out the
         // clone information. *FIX: This is sub-optimal, since we can