Merge branch 'master' of github.com:HazimGazov/Inertia

Conflicts:
	indra/newview/llviewermenu.cpp

indra/newview/llviewermenu.cpp

@@ -234,6 +234,7 @@
 #include "llfloatermessagelog.h"
 #include "llfloatermessagebuilder.h"
 #include "llao.h"
+#include "llfloaterexportregion.h"
 // </edit>
 
 using namespace LLVOAvatarDefines;
@@ -5645,6 +5646,10 @@ class LLShowFloater : public view_listener_t
 		{
 			JCFloaterAreaSearch::toggle();
 		}
+		else if (floater_name == "export region")
+		{
+			LLFloaterExportRegion::toggleInstance(LLSD());
+		}
 		else if (floater_name == "grid options")
 		{
 			LLFloaterBuildOptions::show(NULL);