Merge remote-tracking branch 'singu/master'

indra/newview/statemachine/aidirpicker.h

@@ -63,6 +63,8 @@ public:
 	bool hasDirname(void) const { return hasFilename(); }
 	std::string const& getDirname(void) const { return getFilename(); }
 
+	/*virtual*/ const char* getName() const { return "AIDirPicker"; }
+
 public:
 	// Basically all public members of AIStateMachine could made accessible here,
 	// but I don't think others will ever be needed (not even these, actually).

indra/newview/statemachine/aifilepicker.h

@@ -188,6 +188,8 @@ public:
 	std::string getFolder(void) const;
 	std::vector<std::string> const& getFilenames(void) const { return mFilenames; }
 
+	/*virtual*/ const char* getName() const { return "AIFilePicker"; }
+
 	// Load the sContextMap from disk.
 	static bool loadFile(std::string const& filename);
 	// Save the sContextMap to disk.