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

[Robin Cornelius]

The following commit has been merged in the master branch:
commit 19503a94f374c5879ce3418682101eeb784505ec
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Thu Jun 26 15:43:24 2008 +0100

    update patch and changelog for build fail

diff --git a/debian/changelog b/debian/changelog
index e173b47..2a606bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 omvviewer (1.20.10-1) experimental; urgency=low
 
   * New Upstream Version
-    + Add patches/0000_explicit_cast_for_gcc_4_1_2.dpatch
     + Drop patches/oldpatch/VWR1352_fix_strange_llstyle_copy_operation.dpatch
   * Fix watch file
 
diff --git a/debian/patches/0000_explicit_cast_for_gcc_4_1_2.dpatch b/debian/patches/0000_explicit_cast_for_gcc_4_1_2.dpatch
deleted file mode 100644
index 4e3b3f0..0000000
--- a/debian/patches/0000_explicit_cast_for_gcc_4_1_2.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Explicit cast for gcc 4.1.2 compatibility.dpatch by  <robin.cornelius at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: gcc 4.1.2 does not seem to handle the implicit cast on its own and as 
-## DP: we use 4.1.2 in the etch pbuilder we need to fix this
-
- at DPATCH@
-
-diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
-index f745aca..104ea61 100644
---- a/indra/newview/llviewerregion.cpp
-+++ b/indra/newview/llviewerregion.cpp
-@@ -108,7 +108,7 @@ public:
- 
-     void result(const LLSD& content)
-     {
--		if(!mRegion || this != mRegion->getHttpResponderPtr())//region is removed or responder is not created.
-+		if(!mRegion || this != (boost::intrusive_ptr<LLCurl::Responder>)mRegion->getHttpResponderPtr())//region is removed or responder is not created.
- 		{
- 			return ;
- 		}
diff --git a/debian/patches/00list b/debian/patches/00list
index 42d1978..2e6f1d2 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -73,5 +73,4 @@ VWR-1815_top_corner_fix.dpatch
 0001_possible_crash_in_llviewerpartssim.dpatch
 VWR-5697_fix_startup_paths.dpatch
 VWR-7271_fix_mutlist_for_amd64.dpatch
-0000_valgrind_wild_vars.dpatch
-0000_explicit_cast_for_gcc_4_1_2.dpatch
+0000_valgrind_wild_vars.dpatch
\ No newline at end of file

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