Merge pull request #4528 from ZappoMan/avatarUI

Support for Auto-detecting FST type, and adding type hint to FST files when packaged

Philip Rosedale committed 11 years ago

Commit 53254782 parents ce05d31 0366ce918 files · +281 −103Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 18 files). Show all

Unified · Split

@@ -638,7 +638,7 @@ QScriptValue WindowScriptingInterface::showBrowse(const QString& title, const QS · 637 unmodified lines
638	638	/// \param const QString& nameFilter filter to filter filenames
639	639	/// \return QScriptValue file path as a string if one was selected, otherwise `QScriptValue::NullValue`
640	640	QScriptValue WindowScriptingInterface::showS3Browse(const QString& nameFilter) {
641		− ModelsBrowser browser(ENTITY_MODEL);
	641	+ ModelsBrowser browser(FSTReader::ENTITY_MODEL);
642	642	if (nameFilter != "") {
643	643	browser.setNameFilter(nameFilter);
644	644	}