A bit of cleanup and make the return of showAlert match the OSBTN return types in llwindow.h.

1 files changed, 14 insertions, 5 deletions

diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index 3703dcf28d..0354c2b717 100755
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -418,13 +418,22 @@ long showAlert(std::string text, std::string title, int type)
     
     if (ret == NSAlertFirstButtonReturn)
     {
-        ret = 0;
+        if (type == 1)
+        {
+            ret = 3;
+        } else if (type == 2)
+        {
+            ret = 0;
+        }
     } else if (ret == NSAlertSecondButtonReturn)
     {
-        ret = 1;
-    } else if (ret == NSAlertThirdButtonReturn)
-    {
-        ret = 2;
+        if (type == 0 || type == 1)
+        {
+            ret = 2;
+        } else if (type == 2)
+        {
+            ret = 1;
+        }
     }
     
     return ret;