3 files changed, 146 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a38a475..0f9b633 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,11 @@
 2010-01-09 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Fixed missing dbghelp.dll file.
+        
+          modified:   linden/indra/cmake/ViewerMiscLibs.cmake
+          modified:   linden/install.xml
+
+
         * Always include VS2005 redist in copy_win_libs.
         
           modified:   linden/indra/cmake/CopyWinLibs.cmake
diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake
index 2a8abda..7bd306b 100644
--- a/linden/indra/cmake/ViewerMiscLibs.cmake
+++ b/linden/indra/cmake/ViewerMiscLibs.cmake
@@ -7,3 +7,7 @@ if (NOT STANDALONE)
   use_prebuilt_binary(fontconfig)
 endif(NOT STANDALONE)
 
+if (WINDOWS)
+  use_prebuilt_binary(dbghelp)
+endif (WINDOWS)
+
diff --git a/linden/install.xml b/linden/install.xml
index da058e8..50cc8a7 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -288,6 +288,25 @@
           </map>
         </map>
       </map>
+          <key>dbghelp</key>
+      <map>
+        <key>copyright</key>
+        <string>Copyright Microsoft Corporation</string>
+        <key>description</key>
+        <string>dbghelp: Debug helper from Microsoft Debugging Tools For Windows</string>
+        <key>license</key>
+        <string>MSDTW</string>
+        <key>packages</key>
+        <map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>d893094b001df170ab445577da4a41bf</string>
+            <key>url</key>
+            <uri>http://imprudenceviewer.org/download/libs/dbghelp-6.11.1.404-windows-201010901.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>dbusglib</key>
       <map>
         <key>copyright</key>
@@ -1534,6 +1553,123 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
         <key>url</key>
         <string>http://www.xfree86.org/4.4.0/LICENSE9.html#sgi</string>
       </map>
+          <key>MSDTW</key>
+      <map>
+        <key>text</key>
+        <string>MICROSOFT SOFTWARE LICENSE TERMS 
+MICROSOFT DEBUGGING TOOLS FOR WINDOWS 
+These license terms are an agreement between Microsoft Corporation (or based on where you live, one of 
+its affiliates) and you.  Please read them.  They apply to the software named above, which includes the 
+media on which you received it, if any.  The terms also apply to any Microsoft
+*       updates,
+*       supplements,
+*       Internet-based services 
+*       support services, and
+*       Debugging symbol files that you may access over the internet 
+for this software, unless other terms accompany those items.  If so, those terms apply.
+By using the software, you accept these terms.  If you do not accept them, do not use the 
+software.
+If you comply with these license terms, you have the rights below.
+1.      INSTALLATION AND USE RIGHTS.  One user may install and use any number of copies of the 
+software on your devices to design, develop, debug and test your programs.
+2.      ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS.
+a.      Distributable Code.  The software contains code that you are permitted to distribute in programs 
+you develop if you comply with the terms below.
+i.      Right to Use and Distribute.  The code and text files listed below are “Distributable Code.”
+*       REDIST.TXT Files.  You may copy and distribute the object code form of code listed in 
+REDIST.TXT files.
+*       Sample Code.  You may modify, copy, and distribute the source and object code form of 
+code marked as “sample.”
+*       Third Party Distribution.  You may permit distributors of your programs to copy and 
+distribute the Distributable Code as part of those programs.
+ii.     Distribution Requirements.  For any Distributable Code you distribute, you must
+*       add significant primary functionality to it in your programs;
+*       require distributors and external end users to agree to terms that protect it at least as much 
+as this agreement; 
+*       display your valid copyright notice on your programs; and
+*       indemnify, defend, and hold harmless Microsoft from any claims, including attorneys’ fees, 
+related to the distribution or use of your programs.
+iii.    Distribution Restrictions.  You may not
+*       alter any copyright, trademark or patent notice in the Distributable Code; 
+*       distribute any symbol files which you may access or use under these license terms for the 
+software;
+*       use Microsoft’s trademarks in your programs’ names or in a way that suggests your 
+programs come from or are endorsed by Microsoft; 
+*       distribute Distributable Code to run on a platform other than the Windows platform;
+*       include Distributable Code in malicious, deceptive or unlawful programs; or
+*       modify or distribute the source code of any Distributable Code so that any part of it 
+becomes subject to an Excluded License.  An Excluded License is one that requires, as a 
+condition of use, modification or distribution, that
+*       the code be disclosed or distributed in source code form; or 
+*       others have the right to modify it.
+3.      SCOPE OF LICENSE.  The software is licensed, not sold. This agreement only gives you some rights 
+to use the software.  Microsoft reserves all other rights.  Unless applicable law gives you more rights 
+despite this limitation, you may use the software only as expressly permitted in this agreement.  In 
+doing so, you must comply with any technical limitations in the software that only allow you to use it in 
+certain ways.    You may not
+*       work around any technical limitations in the software;
+*       reverse engineer, decompile or disassemble the software, except and only to the extent that 
+applicable law expressly permits, despite this limitation;
+*       make more copies of the software than specified in this agreement or allowed by applicable law, 
+despite this limitation;
+*       publish the software for others to copy;
+*       rent, lease or lend the software;
+*       transfer the software or this agreement to any third party; or
+*       use the software for commercial software hosting services.   
+4.      INTERNET-BASED SERVICES.  Microsoft provides Internet-based services with the software.  It may 
+change or cancel them at any time.
+a.      Consent for Internet-Based Services.  The software contains features which may connect to 
+Microsoft or service provider computer systems over the Internet.  In some cases, you will not 
+receive a separate notice when they connect.  You may switch these features on or you may 
+choose not to use them.  For more information about these features, see 
+http://www.microsoft.com/info/privacy/default.mspx.  By using these features, you consent to the transmission of 
+this information.  Microsoft does not use the information to identify or contact you.
+b.      Misuse of Internet-based Services.  You may not use these services in any way that could 
+harm them or impair anyone else’s use of them.  You may not use the services to try to gain 
+unauthorized access to any service, data, account or network by any means.     
+  
+5.      BACKUP COPY.  You may make one backup copy of the software.  You may use it only to reinstall the 
+software.
+6.      DOCUMENTATION.  Any person that has valid access to your computer or internal network may copy 
+and use the documentation for your internal, reference purposes.
+7.      EXPORT RESTRICTIONS.  The software is subject to United States export laws and regulations.  You 
+must comply with all domestic and international export laws and regulations that apply to the software.  
+These laws include restrictions on destinations, end users and end use.  For additional information, see 
+www.microsoft.com/exporting.
+8.      SUPPORT SERVICES. Because this software is “as is,” we may not provide support services for it.
+9.      ENTIRE AGREEMENT.  This agreement, and the terms for supplements, updates, Internet-based 
+services and support services that you use, are the entire agreement for the software and support 
+services.
+10.     APPLICABLE LAW.
+a.      United States.  If you acquired the software in the United States, Washington state law governs 
+the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of 
+laws principles.  The laws of the state where you live govern all other claims, including claims under 
+state consumer protection laws, unfair competition laws, and in tort.
+b.      Outside the United States.  If you acquired the software in any other country, the laws of that 
+country apply.
+11.     LEGAL EFFECT.  This agreement describes certain legal rights.  You may have other rights under the 
+laws of your country.  You may also have rights with respect to the party from whom you acquired the 
+software.  This agreement does not change your rights under the laws of your country if the laws of 
+your country do not permit it to do so.
+12.     DISCLAIMER OF WARRANTY.   The software is licensed “as-is.”  You bear the risk of using 
+it.  Microsoft gives no express warranties, guarantees or conditions.  You may have 
+additional consumer rights under your local laws which this agreement cannot change.  To 
+the extent permitted under your local laws, Microsoft excludes the implied warranties of 
+merchantability, fitness for a particular purpose and non-infringement.
+13.     LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES.   You can recover from 
+Microsoft and its suppliers only direct damages up to U.S. $5.00.  You cannot recover any 
+other damages, including consequential, lost profits, special, indirect or incidental 
+damages.
+This limitation applies to
+*       anything related to the software, services, content (including code) on third party Internet sites, or 
+third party programs; and
+*       claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, 
+or other tort to the extent permitted by applicable law.
+It also applies even if Microsoft knew or should have known about the possibility of the damages.  The 
+above limitation or exclusion may not apply to you because your country may not allow the exclusion or 
+limitation of incidental, consequential or other damages.
+                </string>
+      </map>
       <key>apache 2.0</key>
       <map>
         <key>url</key>