From bfdc9779c693b908fbc86492fa972099b17ee64e Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Tue, 7 Jul 2009 14:57:25 -0700
Subject: Fixed loading the wrong eventhost dll name on windows.

---
 indra/newview/llappviewer.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'indra')

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,
-- 
cgit v1.2.3