Merge branch 'next' into openal

Conflicts:

	ChangeLog.txt

12 files changed, 194 insertions, 100 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 4fe387f..2cf418e 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, 
@@ -2248,6 +2249,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;
@@ -2331,6 +2333,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 6bd2c41..4953410 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -111,9 +111,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__);
@@ -267,17 +267,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/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp
index 01d77f6..dba603b 100644
--- a/linden/indra/newview/llpreviewlandmark.cpp
+++ b/linden/indra/newview/llpreviewlandmark.cpp
@@ -90,7 +90,15 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name,
 {
         
         mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this);
-        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        if (show_keep_discard)
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap());
+                childSetAction("Discard btn",onDiscardBtn,this);
+        }
+        else
+        {
+                LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_existing_landmark.xml", &getFactoryMap());
+        }
 
         /*
         childSetCommitCallback("desc_editor", LLPreview::onText, this);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 4266d82..c863d19 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2492,14 +2492,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/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 260265e..28ca198 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -833,9 +833,9 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                 //if we are throttled, don't display them - Gigs
                 if (check_offer_throttle(from_name, false))
                 {
-                        // I'm not sure this is a good idea.  JC
-                        bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
-                        //bool show_keep_discard = true;
+                        // I'm not sure this is a good idea.  JC  -  Definitely a bad idea.  HB
+                        //bool show_keep_discard = item->getPermissions().getCreator() != gAgent.getID();
+                        bool show_keep_discard = true;
                         switch(asset_type)
                         {
                         case LLAssetType::AT_NOTECARD:
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index c8cffcf..9019b88 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -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>
diff --git a/linden/indra/newview/skins/default/xui/en-us/notify.xml b/linden/indra/newview/skins/default/xui/en-us/notify.xml
index 6af19ee..d169741 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notify.xml
@@ -593,6 +593,9 @@ see each other&apos;s online status.)
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="FriendshipAccepted" tip="false">
                 <message name="message">
@@ -616,6 +619,9 @@ so you can quickly IM this resident.
                 <option name="Decline">
                         Decline
                 </option>
+                <option name="Ignore">
+                        Ignore
+                </option>
         </notify>
         <notify name="RegionRestartMinutes" tip="false">
                 <message name="message">
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index cbc9a84..0dfd8db 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -44,6 +44,16 @@ class ViewerManifest(LLManifest):
         self.exclude("*.svn*")
         self.path(src="../../scripts/messages/message_template.msg", dst="app_settings/message_template.msg")
         self.path(src="../../etc/message.xml", dst="app_settings/message.xml")
+        self.path(src="../../../ChangeLog.txt", dst="doc/ChangeLog.txt")
+        self.path(src="../../../CONTRIBUTE.txt", dst="doc/CONTRIBUTE.txt")
+        self.path(src="../../../MANIFESTO.txt", dst="doc/MANIFESTO.txt")
+        self.path(src="../../../README.txt", dst="doc/README.txt")
+        self.path(src="../../../RELEASE_NOTES.txt", dst="doc/RELEASE_NOTES.txt")
+        self.path(src="../../doc/contributions.txt", dst="doc/ll-contributions.txt")
+        self.path(src="../../doc/FLOSS-exception.txt", dst="doc/FLOSS-exception.txt")
+        self.path(src="../../doc/GPL-license.txt", dst="doc/GPL-license.txt")
+        self.path(src="../../doc/releasenotes-where.txt", dst="doc/ll-releasenotes-where.txt")
+# 
 
         if self.prefix(src="app_settings"):
             self.exclude("logcontrol.xml")
@@ -75,30 +85,60 @@ class ViewerManifest(LLManifest):
             self.path("*.txt")
             self.end_prefix("fonts")
 
-            # skins
-            if self.prefix(src="skins"):
-                    self.path("paths.xml")
-                    # include the entire textures directory recursively
-                    if self.prefix(src="*/textures"):
-                            self.path("*.tga")
-                            self.path("*.j2c")
-                            self.path("*.jpg")
-                            self.path("*.png")
-                            self.path("textures.xml")
-                            self.end_prefix("*/textures")
-                    self.path("*/xui/*/*.xml")
-                    self.path("*/*.xml")
-                    
-                    # Local HTML files (e.g. loading screen)
-                    if self.prefix(src="*/html"):
-                            self.path("*.png")
-                            self.path("*/*/*.html")
-                            self.path("*/*/*.gif")
-                            self.end_prefix("*/html")
-                    self.end_prefix("skins")
+        # skins
+        if self.prefix(src="skins"):
+            self.path("paths.xml")
+            
+            # include the entire textures directory recursively
+            if self.prefix(src="*/textures"):
+                self.path("*.tga")
+                self.path("*.j2c")
+                self.path("*.jpg")
+                self.path("*.png")
+                self.path("textures.xml")
+                self.end_prefix("*/textures")
+
+            self.path("*/xui/*/*.xml")
+            self.path("*/*.xml")
+
+            # Local HTML files (e.g. loading screen)
+            if self.prefix(src="*/html"):
+                self.path("*.png")
+                self.path("*/*/*.html")
+                self.path("*/*/*.gif")
+                self.end_prefix("*/html")
+                
+            self.end_prefix("skins")
+            
         self.path("lsl_guide.html")
         self.path("gpu_table.txt")
 
+
+    # Gather up the README file, etc.
+    def gather_documents(self):
+        # From the top level directory (imprudence)
+        if self.prefix("../../..", dst=""):
+            self.path("README.txt")
+            self.path("MANIFESTO.txt")
+            self.path("CONTRIBUTE.txt")
+            self.path("RELEASE_NOTES.txt")
+            self.path("ChangeLog.txt")
+            self.end_prefix("../../..")
+
+        # From the linden directory
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-source.txt")
+            self.path("LICENSE-logos.txt", "LICENSE-artwork.txt")
+            self.end_prefix("../..")
+
+        # From the linden/doc directory
+        if self.prefix("../../doc", dst="doc"):
+            self.path("contributions.txt")
+            self.path("GPL-license.txt", "GPL.txt")
+            self.path("FLOSS-exception.txt")
+            self.end_prefix("../../doc")
+
+
     def login_channel(self):
         """Channel reported for login and upgrade purposes ONLY;
         used for A/B testing"""
@@ -161,7 +201,13 @@ class WindowsManifest(ViewerManifest):
                 #'../llkdu/relwithdebinfo/llkdu.dll',
                 #'../../libraries/i686-win32/lib/release/llkdu.dll'), 
                 #  dst='llkdu.dll')
-        self.path(src="licenses-win32.txt", dst="licenses.txt")
+
+        self.gather_documents()
+
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries-win32.txt")
+            self.end_prefix("../..")
+
 
         self.path("featuretable.txt")
 
@@ -388,7 +434,13 @@ class DarwinManifest(ViewerManifest):
                     self.path("*.tif")
                     self.end_prefix("cursors_mac")
 
-                self.path("licenses-mac.txt", dst="licenses.txt")
+                # From the linden directory
+                if self.prefix("../..", dst="doc"):
+                    self.path("LICENSE-libraries-mac.txt")
+                    self.end_prefix("../..")
+
+                self.gather_documents()
+
                 self.path("featuretable_mac.txt")
                 self.path("SecondLife.nib")
 
@@ -528,16 +580,23 @@ class DarwinManifest(ViewerManifest):
 class LinuxManifest(ViewerManifest):
     def construct(self):
         super(LinuxManifest, self).construct()
-        self.path("licenses-linux.txt","licenses.txt")
+
         self.path("res/imprudence_icon.png","imprudence_icon.png")
         if self.prefix("linux_tools", dst=""):
-            self.path("client-readme.txt","README-linux.txt")
+            #self.path("client-readme.txt","README-linux.txt")
             #self.path("client-readme-voice.txt","README-linux-voice.txt")
             self.path("wrapper.sh","imprudence")
             self.path("handle_secondlifeprotocol.sh")
             self.path("register_secondlifeprotocol.sh")
             self.end_prefix("linux_tools")
 
+        self.gather_documents()
+
+        # From the linden directory
+        if self.prefix("../..", dst="doc"):
+            self.path("LICENSE-libraries-linux.txt")
+            self.end_prefix("../..")
+
         # Create an appropriate gridargs.dat for this package, denoting required grid.
         self.put_in_file(self.flags_list(), 'gridargs.dat')