Merge branch 'next' into doc

14 files changed, 219 insertions, 83 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9131a3f..090ace0 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,100 @@
+2008-12-11  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llfloaterabout.cpp:
+        Simplified release notes URL scheme.
+        Now uses e.g. "wiki/Release Notes/1.0.0-RC2",
+        which is set up as a wiki redirect.
+
+
+        * linden/indra/newview/llfloaterabout.cpp:
+        Fixed bad string comparison (rel notes url) [#28]
+        Reported by Balp Allen.
+
+
+2008-12-10  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llpanellogin.cpp:
+        Fix grid selector having a duplicate entry. [#24]
+        Patch by Balp Allen.
+        * linden/indra/newview/llpanellogin.h:
+        Ditto.
+        * linden/indra/newview/llstartup.cpp:
+        Ditto.
+
+
+        * linden/indra/newview/llurlhistory.cpp:
+        Better warning when url_history.xml save fails.
+
+
+        * linden/indra/newview/llviewernetwork.cpp:
+        Fixed bad string comparison (grid code name). [#22]
+        Reported by Balp Allen.
+
+
+2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * ChangeLog:
+        Added banners in ChangeLog to set versions apart.
+        
+        Entries should be placed in the section for the
+        version into which they were merged. Entries within
+        a section should be sorted chronologically.
+
+        This is important for keeping track of changes which
+        weren't merged until a later release than they were 
+        written. (Mixing them in chronologically would cause
+        confusion about which changes were included in a
+        release.)
+
+
+        * linden/indra/llmessage/llhttpclient.cpp:
+        VWR-9400b (memleak whenever an LSL script is uploaded)
+        Patch by Henri Beauchamp.
+
+
+        * linden/indra/llmessage/llhttpclient.cpp:
+        VWR-9400 (memleak whenever an LSL script is uploaded)
+        Patch by Carjay McGinnis.
+
+
+        * linden/indra/llimage/llimagetga.cpp:
+        VWR-10837 (use delete [] in LLImageTGA)
+        Patch by Aleric Inglewood.
+
+
+        * linden/indra/llmedia/llmediaimplgstreamer.cpp:
+        VWR-10759 (use delete [] in LLMediaImplGStreamer)
+        Patch by Aleric Inglewood.
+
+
+2008-12-06  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llcommon/llversionviewer.h:
+        Added test version info.
+        * linden/indra/newview/llfloaterabout.cpp:
+        Ditto.
+        * linden/indra/newview/llappviewer.cpp:
+        Ditto.
+        * linden/indra/newview/llpanellogin.cpp:
+        Ditto.
+
+
+2008-12-05  McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * linden/indra/llcommon/llsecondlifeurls.cpp:
+        Changed Release Notes link to point to Imprudence.
+        * linden/indra/newview/llfloaterabout.cpp:
+        Ditto.
+
+
+        * linden/indra/newview/skins/default/xui/en-us/menu_login.xml:
+        Rebranded login menu. [#23]
+
+
+        * linden/indra/newview/llurlhistory.cpp:
+        Fixed blank url_history.xml creation. (VWR-5808)
+
+
 2008-12-01  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/viewer_manifest.py:
@@ -10,6 +107,20 @@
         * Imported license files for libraries and artwork.
 
 
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                       1.0.0 RC2                        -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
+2008-12-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * Imprudence 1.0.0 RC2 released.
+
+
+        * linden/indra/newview/llviewernetwork.cpp:
+        Use 127.0.0.1 for local opensim, not 0.0.0.0.
+
+
 2008-11-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/indra/newview/viewer_manifest.py:
@@ -141,6 +252,11 @@
         and position. It will now correctly inherit from default skin.
 
 
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                       1.0.0 RC1                        -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
 2008-11-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * Imprudence 1.0.0 RC1 released.
diff --git a/linden/indra/llcommon/llsecondlifeurls.cpp b/linden/indra/llcommon/llsecondlifeurls.cpp
index ee478fe..b006a6a 100644
--- a/linden/indra/llcommon/llsecondlifeurls.cpp
+++ b/linden/indra/llcommon/llsecondlifeurls.cpp
@@ -84,4 +84,4 @@ const std::string SL_KB_URL (
         "http://secondlife.com/knowledgebase/");
 
 const std::string RELEASE_NOTES_BASE_URL (
-        "http://secondlife.com/app/releasenotes/");
+        "http://imprudenceviewer.org/wiki/Release_Notes/");
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index bc42359..cddc654 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -45,5 +45,6 @@ const char * const IMP_VIEWER_NAME = "Imprudence";
 const S32 IMP_VERSION_MAJOR = 1;
 const S32 IMP_VERSION_MINOR = 0;
 const S32 IMP_VERSION_PATCH = 0;
+const char * const IMP_VERSION_TEST = "RC2";
 
 #endif
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp
index 32c2111..21d0fd1 100644
--- a/linden/indra/llimage/llimagetga.cpp
+++ b/linden/indra/llimage/llimagetga.cpp
@@ -104,7 +104,7 @@ LLImageTGA::LLImageTGA(const std::string& file_name)
 
 LLImageTGA::~LLImageTGA()
 {
-        delete mColorMap;
+        delete [] mColorMap;
 }
 
 BOOL LLImageTGA::updateData()
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 51a5bca..5d6a648 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -428,7 +428,7 @@ unload ()
 
         if (mediaData)
         {
-                delete mediaData;
+                delete [] mediaData;
                 mediaData = NULL;
         }
 
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index fc2612f..ef163fa 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -160,10 +160,9 @@ namespace
                                 fstream.seekg(0, std::ios::end);
                                 U32 fileSize = fstream.tellg();
                                 fstream.seekg(0, std::ios::beg);
-                                char* fileBuffer;
-                                fileBuffer = new char [fileSize];
-                                fstream.read(fileBuffer, fileSize);
-                                ostream.write(fileBuffer, fileSize);
+                                std::vector<char> fileBuffer(fileSize);
+                                fstream.read(&fileBuffer[0], fileSize);
+                                ostream.write(&fileBuffer[0], fileSize);
                                 fstream.close();
                                 eos = true;
                                 return STATUS_DONE;
@@ -190,10 +189,9 @@ namespace
                         
                         LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
                         S32 fileSize = vfile.getSize();
-                        U8* fileBuffer;
-                        fileBuffer = new U8 [fileSize];
-            vfile.read(fileBuffer, fileSize);
-            ostream.write((char*)fileBuffer, fileSize);
+                        std::vector<U8> fileBuffer(fileSize);
+                        vfile.read(&fileBuffer[0], fileSize);
+                        ostream.write((char*)&fileBuffer[0], fileSize);
                         eos = true;
                         return STATUS_DONE;
                 }
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 243a9d8..14214b5 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -602,11 +602,12 @@ bool LLAppViewer::init()
     writeSystemInfo();
 
         // Build a string representing the current version number.
-    gCurrentVersion = llformat("%s %d.%d.%d / %s %d.%d.%d.%d", 
+    gCurrentVersion = llformat("%s %d.%d.%d %s / %s %d.%d.%d.%d", 
         gSavedSettings.getString("VersionChannelName").c_str(), 
         IMP_VERSION_MAJOR, 
         IMP_VERSION_MINOR, 
-        IMP_VERSION_PATCH, 
+        IMP_VERSION_PATCH,
+                IMP_VERSION_TEST,
         LL_VIEWER_NAME,
         LL_VERSION_MAJOR, 
         LL_VERSION_MINOR, 
@@ -2247,6 +2248,7 @@ void LLAppViewer::writeSystemInfo()
         gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
@@ -2330,6 +2332,7 @@ void LLAppViewer::handleViewerCrash()
         gDebugInfo["ClientInfo"]["ImpMajorVersion"] = IMP_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["ImpMinorVersion"] = IMP_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["ImpPatchVersion"] = IMP_VERSION_PATCH;
+        gDebugInfo["ClientInfo"]["ImpTestVersion"] = IMP_VERSION_TEST;
         gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
         gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
         gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 4704c5b..af436c5 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -110,9 +110,9 @@ LLFloaterAbout::LLFloaterAbout()
 
         // Version string
         std::string version = llformat(
-          "%s %d.%d.%d / %s %d.%d.%d (%d), %s %s\n",
+          "%s %d.%d.%d %s / %s %d.%d.%d (%d), %s %s\n",
                 IMP_VIEWER_NAME,
-          IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH,
+          IMP_VERSION_MAJOR, IMP_VERSION_MINOR, IMP_VERSION_PATCH, IMP_VERSION_TEST,
                 LL_VIEWER_NAME,
           LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
           __DATE__, __TIME__);
@@ -262,17 +262,16 @@ void LLFloaterAbout::show(void*)
 static std::string get_viewer_release_notes_url()
 {
         std::ostringstream version;
-        version << LL_VERSION_MAJOR << "."
-                << LL_VERSION_MINOR << "."
-                << LL_VERSION_PATCH << "."
-                << LL_VERSION_BUILD;
+        version << IMP_VERSION_MAJOR << "."
+                << IMP_VERSION_MINOR << "."
+                << IMP_VERSION_PATCH;
 
-        LLSD query;
-        query["channel"] = gSavedSettings.getString("VersionChannelName");
-        query["version"] = version.str();
+        // Append the test version if it's not empty
+        if( strcmp(IMP_VERSION_TEST, "") != 0 )
+                version << "-" << IMP_VERSION_TEST;
 
         std::ostringstream url;
-        url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query);
+        url << RELEASE_NOTES_BASE_URL << version.str();
 
         return url.str();
 }
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 09e2cee..a495516 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -360,10 +360,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
         // childSetAction("quit_btn", onClickQuit, this);
 
         std::string imp_channel = gSavedSettings.getString("VersionChannelName");
-        std::string imp_version = llformat("%d.%d.%d",
+        std::string imp_version = llformat("%d.%d.%d %s",
                 IMP_VERSION_MAJOR,
                 IMP_VERSION_MINOR,
-                IMP_VERSION_PATCH );
+                IMP_VERSION_PATCH,
+                IMP_VERSION_TEST );
 
         std::string ll_channel = LL_VIEWER_NAME;
         std::string ll_version = llformat("%d.%d.%d (%d)",
@@ -711,6 +712,14 @@ void LLPanelLogin::addServer(const std::string& server, S32 domain_name)
         combo->setCurrentByIndex(0);
 }
 
+
+// static
+void LLPanelLogin::setServer(S32 domain_name)
+{
+        LLComboBox* combo = sInstance->getChild<LLComboBox>("server_combo");
+        combo->setCurrentByIndex(domain_name);
+}
+
 // static
 void LLPanelLogin::getFields(std::string &firstname, std::string &lastname, std::string &password,
                                                         BOOL &remember)
diff --git a/linden/indra/newview/llpanellogin.h b/linden/indra/newview/llpanellogin.h
index 539997b..78b0a22 100644
--- a/linden/indra/newview/llpanellogin.h
+++ b/linden/indra/newview/llpanellogin.h
@@ -87,6 +87,7 @@ public:
                 const std::string& password, BOOL remember);
 
         static void addServer(const std::string& server, S32 domain_name);
+        static void setServer(S32 domain_name);
         static void refreshLocation( bool force_visible );
 
         static void getFields(std::string& firstname, std::string& lastname,
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 625b1d8..6371f2b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2458,14 +2458,14 @@ void login_show()
         // UI textures have been previously loaded in doPreloadImages()
         
         LL_DEBUGS("AppInit") << "Setting Servers" << LL_ENDL;
-
-        LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
+        LL_INFOS("AppInit") << "getGridChoice is " << LLViewerLogin::getInstance()->getGridChoice() << LL_ENDL;
 
         LLViewerLogin* vl = LLViewerLogin::getInstance();
         for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
         {
                 LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
         }
+        LLPanelLogin::setServer(LLViewerLogin::getInstance()->getGridChoice()-1);
 }
 
 // Callback for when login screen is closed.  Option 0 = connect, option 1 = quit.
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index ac3fa93..c10add4 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -72,9 +72,17 @@ bool LLURLHistory::loadFile(const std::string& filename)
 
 // static
 bool LLURLHistory::saveFile(const std::string& filename)
-{
-        std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter();
-        llofstream out((temp_str + filename));
+{       
+        std::string temp_str = gDirUtilp->getLindenUserDir();
+        if( temp_str.empty() )
+        {
+                llwarns << "Can't save " << filename 
+                        << ": No user directory set." << llendl;
+                return false;
+        }
+
+        temp_str += gDirUtilp->getDirDelimiter() + filename;
+        llofstream out(temp_str);
         if (!out.good())
         {
                 llwarns << "Unable to open " << filename << " for output." << llendl;
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 5b423ff..9019b88 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -60,7 +60,7 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
         { "Local OpenSim",
           "",
           "localhost",
-          "http://0.0.0.0:9000",
+          "http://127.0.0.1:9000",
           "" },
         { "Other", "", "", "", "" }
 };
@@ -110,34 +110,34 @@ void LLViewerLogin::setGridChoice(const std::string& grid_name)
         // The string can be:
         // - a grid label from the gGridInfo table 
         // - an ip address
-    if(!grid_name.empty())
-    {
-        // find the grid choice from the user setting.
-        int grid_index = GRID_INFO_NONE; 
-        for(;grid_index < GRID_INFO_OTHER; ++grid_index)
-        {
-            if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
-            {
+        if(!grid_name.empty())
+        {
+                // find the grid choice from the user setting.
+                int grid_index = GRID_INFO_NONE; 
+                for(;grid_index < GRID_INFO_OTHER; ++grid_index)
+                {
+                        if(0 == LLStringUtil::compareInsensitive(gGridInfo[grid_index].mLabel, grid_name))
+                        {
                                 // Founding a matching label in the list...
                                 setGridChoice((EGridInfo)grid_index);
                                 break;
-            }
-        }
+                        }
+                }
 
-        if(GRID_INFO_OTHER == grid_index)
-        {
-            // *FIX:MEP Can and should we validate that this is an IP address?
-            mGridChoice = GRID_INFO_OTHER;
-            mGridName = grid_name;
+                if(GRID_INFO_OTHER == grid_index)
+                {
+                        // *FIX:MEP Can and should we validate that this is an IP address?
+                        mGridChoice = GRID_INFO_OTHER;
+                        mGridName = grid_name;
                         gSavedSettings.setS32("ServerChoice", mGridChoice);
                         gSavedSettings.setString("CustomServer", mGridName);
-        }
-    }
+                }
+        }
 }
 
 void LLViewerLogin::resetURIs()
 {
-    // Clear URIs when picking a new server
+        // Clear URIs when picking a new server
         gSavedSettings.setValue("CmdLineLoginURI", LLSD::emptyArray());
         gSavedSettings.setString("CmdLineHelperURI", "");
 }
@@ -163,7 +163,8 @@ std::string LLViewerLogin::getGridLabel() const
 
 std::string LLViewerLogin::getGridCodeName() const
 {
-        if( gGridInfo[mGridChoice].mCodeName == "" )
+        // Fall back to grid label if code name is empty.
+        if( strcmp(gGridInfo[mGridChoice].mCodeName, "") == 0 )
         {
                 return getGridLabel();
         }
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index d7ff80b..8d06657 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"

-     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"

-     tear_off="false" width="802">

-        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="263" label="File" left="0" mouse_opaque="false" name="File"

-             opaque="true" tear_off="false" width="243">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"

-                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">

-                        <on_click function="File.Quit" userdata="" />

-                </menu_item_call>

-        </menu>

-        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"

-             opaque="true" tear_off="false" width="153">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"

-                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">

-                        <on_click function="ShowFloater" userdata="preferences" />

-                </menu_item_call>

-        </menu>

-        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"

-             height="317" label="Help" left="80" mouse_opaque="false" name="Help"

-             opaque="true" tear_off="false" width="166">

-                <menu_item_call bottom="-29" enabled="true" height="19" label="Second Life Help" left="0"

-                     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">

-                        <on_click function="ShowFloater" userdata="help f1" />

-                </menu_item_call>

-                <menu_item_call bottom="-48" enabled="true" height="19" label="About Second Life..." left="0"

-                     mouse_opaque="true" name="About Second Life..." width="166">

-                        <on_click function="ShowFloater" userdata="about" />

-                </menu_item_call>

-        </menu>

-</menu_bar>

+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
+     tear_off="false" width="802">
+        <menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="263" label="File" left="0" mouse_opaque="false" name="File"
+             opaque="true" tear_off="false" width="243">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Quit" left="0"
+                     mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
+                        <on_click function="File.Quit" userdata="" />
+                </menu_item_call>
+        </menu>
+        <menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="439" label="Edit" left="38" mouse_opaque="false" name="Edit"
+             opaque="true" tear_off="false" width="153">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Preferences..." left="0"
+                     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
+                        <on_click function="ShowFloater" userdata="preferences" />
+                </menu_item_call>
+        </menu>
+        <menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
+             height="317" label="Help" left="80" mouse_opaque="false" name="Help"
+             opaque="true" tear_off="false" width="166">
+                <menu_item_call bottom="-29" enabled="true" height="19" label="Viewer Help" left="0"
+                     mouse_opaque="true" name="Viewer Help" shortcut="F1" width="166">
+                        <on_click function="ShowFloater" userdata="help f1" />
+                </menu_item_call>
+                <menu_item_call bottom="-48" enabled="true" height="19" label="About Imprudence..." left="0"
+                     mouse_opaque="true" name="About Imprudence..." width="166">
+                        <on_click function="ShowFloater" userdata="about" />
+                </menu_item_call>
+        </menu>
+</menu_bar>