Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

Conflicts:
	indra/newview/llfloateravatarlist.cpp
	indra/newview/llfloateropenobject.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/llviewerinventory.cpp

indra/newview/llvoavatar.h

@@ -979,6 +979,9 @@ private:
 	LLFrameTimer	mTimeVisible;
 	std::deque<LLChat> mChats;
 	BOOL			mTyping;
+public:
+	BOOL isTyping(){ return mTyping; }
+private:
 	LLFrameTimer	mTypingTimer;
 	static void on_avatar_name_response(const LLUUID& agent_id, const LLAvatarName& av_name, void *userdata);