From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001
From: Bryan O'Sullivan <bos@lindenlab.com>
Date: Mon, 2 Jun 2008 21:14:31 +0000
Subject: svn merge -r88066:88786
 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge

dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
---
 indra/newview/llappviewermacosx.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llappviewermacosx.cpp')

diff --git a/indra/newview/llappviewermacosx.cpp b/indra/newview/llappviewermacosx.cpp
index f21bdc4243..c1e6888478 100644
--- a/indra/newview/llappviewermacosx.cpp
+++ b/indra/newview/llappviewermacosx.cpp
@@ -65,7 +65,12 @@ int main( int argc, char **argv )
 #endif
 
 	// Set the working dir to <bundle>/Contents/Resources
-	(void) chdir(gDirUtilp->getAppRODataDir().c_str());
+	if (chdir(gDirUtilp->getAppRODataDir().c_str()) == -1)
+	{
+		llwarns << "Could not change directory to "
+				<< gDirUtilp->getAppRODataDir() << ": " << strerror(errno)
+				<< llendl;
+	}
 
 	LLAppViewerMacOSX* viewer_app_ptr = new LLAppViewerMacOSX();
 
-- 
cgit v1.2.3