[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.14-63-ge4a4413

[Robin Cornelius]

The following commit has been merged in the master branch:
commit e4a4413eb837eeb4bdd1ae8a4a4eec7abcf29f3f
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Fri Jul 25 13:38:50 2008 +0200

    Bump to new version and add in missing memcheck removal

diff --git a/debian/changelog b/debian/changelog
index 8f01635..f4a9903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+omvviewer (1.20.15-1) unstable; urgency=low
+
+  * New Upstream Version, 
+    + Add 0000_no_idle_memcheck.dpatch
+
+ -- Robin Cornelius <robin.cornelius at gmail.com>  Fri, 25 Jul 2008 13:35:23 +0200
+
 omvviewer (1.20.14-1) experimental; urgency=low
 
   * New Upstream Version
diff --git a/debian/patches/0000_no_idle_memcheck.dpatch b/debian/patches/0000_no_idle_memcheck.dpatch
new file mode 100644
index 0000000..af865b1
--- /dev/null
+++ b/debian/patches/0000_no_idle_memcheck.dpatch
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Don't call idle mem check.dpatch by  <robin.cornelius at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This fix missed the offical release but needs to go in now
+
+ at DPATCH@
+
+diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
+index 6e8528c..dc79dd4 100644
+--- a/indra/newview/llappviewer.cpp
++++ b/indra/newview/llappviewer.cpp
+@@ -942,7 +942,7 @@ bool LLAppViewer::mainLoop()
+ #endif
+ 
+ 			//at the beginning of every frame, check if the system can successfully allocate 10 * 1 MB memory.
+-			idle_mem_check(10) ;
++			//idle_mem_check(10) ;
+ 
+ 			if (!LLApp::isExiting())
+ 			{
diff --git a/debian/patches/00list b/debian/patches/00list
index 35d0c86..cc520fe 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -80,3 +80,4 @@ VWR-5082_set_bulk_inv_permissions.dpatch
 VWR-4981_save_windlight_settings_in_user_rw_area.dpatch
 VWR-5917_multiple_user_day_cycles_in_rw_area.dpatch
 VWR-8194_clamp_outline_for_broken_nvidia.dpatch
+0000_no_idle_memcheck.dpatch

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids