[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 251c4db8fdcffe64c8ec3f2e8bd88f80d9e99197
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Mon Jun 30 15:39:03 2008 +0100

    Import gcc pre 4.1.3 fix

diff --git a/debian/changelog b/debian/changelog
index 5f11186..681f20c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 omvviewer (1.20.11-1) experimental; urgency=low
 
   * New Upstream Version
+    + Add VWR-7831_smart_pointer_explicit_casting.dpatch
 
  -- Robin Cornelius <robin.cornelius at gmail.com>  Thu, 26 Jun 2008 15:45:27 +0100
 
@@ -512,4 +513,4 @@ slviewer (1.16.0.5-1) unstable; urgency=low
 
   * Initial release (Closes: #406335, #406185)
 
- -- Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>  Fri, 25 May 2007 00:02:48 +1000
\ No newline at end of file
+ -- Paul "TBBle" Hampson <Paul.Hampson at Pobox.com>  Fri, 25 May 2007 00:02:48 +1000
diff --git a/debian/patches/00list b/debian/patches/00list
index 2e6f1d2..2df9099 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -73,4 +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
\ No newline at end of file
+0000_valgrind_wild_vars.dpatchVWR-7831_smart_pointer_explicit_casting.dpatch
diff --git a/debian/patches/VWR-7831_smart_pointer_explicit_casting.dpatch b/debian/patches/VWR-7831_smart_pointer_explicit_casting.dpatch
new file mode 100644
index 0000000..335b2c8
--- /dev/null
+++ b/debian/patches/VWR-7831_smart_pointer_explicit_casting.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## Explicit casting for smart pointers.dpatch by  <robin at debian>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: gcc 4.1.2 and older have issues casting a smart pointer from a base class to
+## DP: a smart pointer to a subclass
+
+ at DPATCH@
+
+diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
+index f745aca..829a61b 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 || LLHTTPClient::ResponderPtr(this) != mRegion->getHttpResponderPtr())//region is removed or responder is not created.
+ 		{
+ 			return ;
+ 		}

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