diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-10 10:44:21 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-10 10:44:21 -0500 |
| commit | e3ed1565f8c6eeff5d87f862465038aa98576fa9 (patch) | |
| tree | 4ab57c1658d589d802f1e6bb6ff3331b75b61074 /indra/llplugin/llplugininstance.h | |
| parent | 952c3eaaa8c78d00ef62932d46af1d8fa565e7b2 (diff) | |
| parent | 76cb9a7796ffce930458aae00147f8dafa4b33fb (diff) | |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/llplugin/llplugininstance.h')
| -rw-r--r-- | indra/llplugin/llplugininstance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llplugin/llplugininstance.h b/indra/llplugin/llplugininstance.h index 50531ca77f..e6926c3e37 100644 --- a/indra/llplugin/llplugininstance.h +++ b/indra/llplugin/llplugininstance.h @@ -56,7 +56,7 @@ public: // Load a plugin dll/dylib/so // Returns 0 if successful, APR error code or error code returned from the plugin's init function on failure. - int load(std::string &plugin_file); + int load(const std::string& plugin_dir, std::string &plugin_file); // Sends a message to the plugin. void sendMessage(const std::string &message); |