diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatertos.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lllogininstance.cpp | 9 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp index 40bd6360ed..11f35bedad 100644 --- a/indra/newview/llfloatertos.cpp +++ b/indra/newview/llfloatertos.cpp @@ -57,7 +57,7 @@ LLFloaterTOS::LLFloaterTOS(const LLSD& message) mMessage(message.asString()), mWebBrowserWindowId( 0 ), mLoadCompleteCount( 0 ), - mCallback(callback) + mCallback() { } diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index f967fcaf97..428bed7b72 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -49,6 +49,7 @@ #include "llviewernetwork.h" #include "llviewercontrol.h" #include "llurlsimstring.h" +#include "llfloaterreg.h" #include "llfloatertos.h" #include "llwindow.h" #if LL_LINUX || LL_SOLARIS @@ -221,18 +222,26 @@ bool LLLoginInstance::handleLoginFailure(const LLSD& event) // to reconnect or to end the attempt in failure. if(reason_response == "tos") { + LLFloaterTOS * tos =
+ LLFloaterReg::showTypedInstance<LLFloaterTOS>("message_tos", LLSD(message_response)); + /* LLFloaterTOS::show(LLFloaterTOS::TOS_TOS, message_response, boost::bind(&LLLoginInstance::handleTOSResponse, this, _1, "agree_to_tos")); + */ } else if(reason_response == "critical") { + LLFloaterTOS * tos =
+ LLFloaterReg::showTypedInstance<LLFloaterTOS>("message_critical",LLSD(message_response)); + /* LLFloaterTOS::show(LLFloaterTOS::TOS_CRITICAL_MESSAGE, message_response, boost::bind(&LLLoginInstance::handleTOSResponse, this, _1, "read_critical") ); + */ } else if(reason_response == "update" || gSavedSettings.getBOOL("ForceMandatoryUpdate")) { diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 16731a41d5..d198518ee3 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -494,7 +494,9 @@ class DarwinManifest(ViewerManifest): dylibs[lib] = True
if dylibs["llcommon"]:
- for libfile in ("libapr-1.0.3.7.dylib", "libaprutil-1.0.3.8.dylib"):
+ for libfile in ("libapr-1.0.3.7.dylib",
+ "libaprutil-1.0.3.8.dylib",
+ "libexpat.0.5.0.dylib"):
self.path(os.path.join(libdir, libfile), libfile)
#libfmodwrapper.dylib
|