diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-16 21:54:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-16 21:54:57 -0500 |
| commit | cd885c0a09903837784dc9393769ba177aea8163 (patch) | |
| tree | ecb272c440c8a709263b4c24d884bf72307e113d /indra/llplugin/llplugininstance.h | |
| parent | 008938e37292cc8b66e19f2df3f745e9b178b86d (diff) | |
| parent | 4497502d0d3784a2cfd6871e7609290de2023475 (diff) | |
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
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); |