diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-04 18:46:59 +0000 |
| commit | e61a10ec5b6b84fcb5c27e8e308022d0094f8736 (patch) | |
| tree | bcf6152629edb1b2548af039bd89b6b573e1e514 /indra/newview/llstartup.cpp | |
| parent | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (diff) | |
svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 5e981b8922..f2d0d594f8 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2787,25 +2787,26 @@ void update_app(BOOL mandatory, const std::string& auth_msg) LLStringBase<char>::format_map_t args; args["[MESSAGE]"] = msg; - BOOL *mandatoryp = new BOOL(mandatory); + // represent a bool as a null/non-null pointer + void *mandatoryp = mandatory ? &mandatory : NULL; #if LL_WINDOWS if (mandatory) { gViewerWindow->alertXml("DownloadWindowsMandatory", args, update_dialog_callback, - (void *)mandatoryp); + mandatoryp); } else { #if LL_RELEASE_FOR_DOWNLOAD gViewerWindow->alertXml("DownloadWindowsReleaseForDownload", args, update_dialog_callback, - (void *)mandatoryp); + mandatoryp); #else gViewerWindow->alertXml("DownloadWindows", args, update_dialog_callback, - (void *)mandatoryp); + mandatoryp); #endif } #else @@ -2813,18 +2814,18 @@ void update_app(BOOL mandatory, const std::string& auth_msg) { gViewerWindow->alertXml("DownloadMacMandatory", args, update_dialog_callback, - (void *)mandatoryp); + mandatoryp); } else { #if LL_RELEASE_FOR_DOWNLOAD gViewerWindow->alertXml("DownloadMacReleaseForDownload", args, update_dialog_callback, - (void *)mandatoryp); + mandatoryp); #else gViewerWindow->alertXml("DownloadMac", args, update_dialog_callback, - (void *)mandatoryp); + mandatoryp); #endif } #endif @@ -2835,7 +2836,7 @@ void update_app(BOOL mandatory, const std::string& auth_msg) void update_dialog_callback(S32 option, void *userdata) { std::string update_exe_path; - BOOL mandatory = *(BOOL *)userdata; + BOOL mandatory = userdata != NULL; #if !LL_RELEASE_FOR_DOWNLOAD if (option == 2) |