diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-07-07 14:57:25 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-07 14:57:25 -0700 |
| commit | bfdc9779c693b908fbc86492fa972099b17ee64e (patch) | |
| tree | 000106c83618e376fa9c2abf2eb1e85c6d54bd3e /indra | |
| parent | 9622b2463b79cca7d49a5d794a17a3cffbda9f51 (diff) | |
Fixed loading the wrong eventhost dll name on windows.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b61e75f60d..745e433f3c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4098,14 +4098,13 @@ void LLAppViewer::handleLoginComplete() // *TODO - generalize this and move DSO wrangling to a helper class -brad void LLAppViewer::loadEventHostModule(S32 listen_port) const { - std::string dso_name("liblleventhost"); - + std::string dso_name = #if LL_WINDOWS - dso_name += ".dll"; + "lleventhost.dll"; #elif LL_DARWIN - dso_name += ".dylib"; + "liblleventhost.dylib"; #else - dso_name += ".so"; + "liblleventhost.so"; #endif std::string dso_path = gDirUtilp->findFile(dso_name, |