Second Life viewer sources 1.20.2

1 files changed, 93 insertions, 8 deletions

diff --git a/linden/indra/newview/llappviewermacosx.cpp b/linden/indra/newview/llappviewermacosx.cpp
index e277425..c128634 100644
--- a/linden/indra/newview/llappviewermacosx.cpp
+++ b/linden/indra/newview/llappviewermacosx.cpp
@@ -36,15 +36,25 @@
 #endif
 
 #include "llappviewermacosx.h"
+#include "llcommandlineparser.h"
+
 #include "llmemtype.h"
 
 #include "llviewernetwork.h"
+#include "llviewercontrol.h"
 #include "llmd5.h"
 #include "llurlsimstring.h"
 #include "llfloaterworldmap.h"
 #include "llurldispatcher.h"
 #include <Carbon/Carbon.h>
 
+namespace 
+{
+        // The command line args stored.
+        // They are not used immediately by the app.
+        int gArgC;
+        char** gArgV;
+}
 
 int main( int argc, char **argv ) 
 {
@@ -61,14 +71,11 @@ int main( int argc, char **argv )
 
         viewer_app_ptr->setErrorHandler(LLAppViewer::handleViewerCrash);
 
-        bool ok = viewer_app_ptr->tempStoreCommandOptions(argc, argv);
-        if(!ok)
-        {
-                llwarns << "Unable to parse command line." << llendl;
-                return -1;
-        }
-
-        ok = viewer_app_ptr->init();
+        // Store off the command line args for use later.
+        gArgC = argc;
+        gArgV = argv;
+        
+        bool ok = viewer_app_ptr->init();
         if(!ok)
         {
                 llwarns << "Application init failed." << llendl;
@@ -108,6 +115,84 @@ bool LLAppViewerMacOSX::init()
         return LLAppViewer::init();
 }
 
+// MacOSX may add and addition command line arguement for the process serial number.
+// The option takes a form like '-psn_0_12345'. The following method should be able to recognize
+// and either ignore or return a pair of values for the option.
+// look for this method to be added to the parser in parseAndStoreResults.
+std::pair<std::string, std::string> parse_psn(const std::string& s)
+{
+    if (s.find("-psn_") == 0) 
+        {
+                // *FIX:Mani Not sure that the value makes sense.
+                // fix it once the actual -psn_XXX syntax is known.
+                return std::make_pair("psn", s.substr(5));
+    }
+        else 
+        {
+        return std::make_pair(std::string(), std::string());
+    }
+}
+
+bool LLAppViewerMacOSX::initParseCommandLine(LLCommandLineParser& clp)
+{
+        // The next two lines add the support for parsing the mac -psn_XXX arg.
+        clp.addOptionDesc("psn", NULL, 1, "MacOSX process serial number");
+        clp.setCustomParser(parse_psn);
+        
+        // First parse the command line, not often used on the mac.
+        if(clp.parseCommandLine(gArgC, gArgV) == false)
+        {
+                return false;
+        }
+    
+    // Now read in the args from arguments txt.
+    // Succesive calls to clp.parse... will NOT override earlier 
+    // options. 
+    const char* filename = "arguments.txt";
+        llifstream ifs(filename, llifstream::binary);
+        if (!ifs.is_open())
+        {
+                llwarns << "Unable to open file" << filename << llendl;
+                return false;
+        }
+        
+        if(clp.parseCommandLineFile(ifs) == false)
+        {
+                return false;
+        }
+        
+        // Get the user's preferred language string based on the Mac OS localization mechanism.
+        // To add a new localization:
+                // go to the "Resources" section of the project
+                // get info on "language.txt"
+                // in the "General" tab, click the "Add Localization" button
+                // create a new localization for the language you're adding
+                // set the contents of the new localization of the file to the string corresponding to our localization
+                //   (i.e. "en-us", "ja", etc.  Use the existing ones as a guide.)
+        CFURLRef url = CFBundleCopyResourceURL(CFBundleGetMainBundle(), CFSTR("language"), CFSTR("txt"), NULL);
+        char path[MAX_PATH];
+        if(CFURLGetFileSystemRepresentation(url, false, (UInt8 *)path, sizeof(path)))
+        {
+                LLString lang;
+                if(_read_file_into_string(lang, path))          /* Flawfinder: ignore*/
+                {
+            LLControlVariable* c = gSavedSettings.getControl("SystemLanguage");
+            if(c)
+            {
+                c->setValue(lang, false);
+            }
+                }
+        }
+        CFRelease(url);
+        
+    return true;
+}
+
+void LLAppViewerMacOSX::handleSyncCrashTrace()
+{
+        // do nothing
+}
+
 void LLAppViewerMacOSX::handleCrashReporting()
 {
         // Macintosh