Merge branch 'master' into meshupload

Conflicts:
	indra/newview/llmeshrepository.cpp

Added /* */ around the 'virtual' keyword in two places
that collided with changes in meshupload from lightdrake.

indra/newview/llviewerobjectbackup.cpp

@@ -111,7 +111,7 @@ void setDefaultTextures()
 	}
 }
 
-class importResponder: public LLNewAgentInventoryResponder
+class importResponder : public LLNewAgentInventoryResponder
 {
 public:
 
@@ -191,6 +191,8 @@ public:
 		LLObjectBackup::getInstance()->updateMap(content["new_asset"].asUUID());
 		LLObjectBackup::getInstance()->uploadNextAsset();
 	}
+
+	/*virtual*/ char const* getName(void) const { return "importResponder"; }
 };
 
 class CacheReadResponder : public LLTextureCache::ReadResponder