Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make FilePicker context sensitive default paths persistent over logins.

Browse Source 
Also, make newview/statemachine a separate project.
This commit is contained in:
Aleric Inglewood
2011-05-13 23:50:56 +02:00
parent 5f72cbb103
commit ea2cc3e0de
16 changed files with 168 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llviewerpluginmanager.h
View File

@@ -39,7 +39,6 @@
#include "lldir.h"
#include "llfile.h"
#include "llviewercontrol.h"
#include "llnotifications.h"
#include "llpluginclassbasic.h"
class LLViewerPluginManager : public LLRefCount
@@ -65,6 +64,10 @@ public:
// Return pointer to plugin.
LLPluginClassBasic* getPlugin(void) const { return mPluginBase; }
private:
// Called from createPlugin.
void send_plugin_failure_warning(std::string const& plugin_basename);
protected:
LLPluginClassBasic* mPluginBase; //!< Pointer to the base class of the underlaying plugin.
};
@@ -104,11 +107,7 @@ LLPluginClassBasic* LLViewerPluginManager::createPlugin(T* user_data)
if (mPluginBase)
return mPluginBase;
LL_WARNS("Plugin") << "plugin intialization failed for plugin: " << PLUGIN_TYPE::plugin_basename() << LL_ENDL;
LLSD args;
args["MIME_TYPE"] = PLUGIN_TYPE::plugin_basename(); // FIXME: Use different notification.
LLNotifications::instance().add("NoPlugin", args);
send_plugin_failure_warning(PLUGIN_TYPE::plugin_basename());
return NULL;
}