1 files changed, 28 insertions, 7 deletions

diff --git a/linden/indra/llmessage/llmessagethrottle.cpp b/linden/indra/llmessage/llmessagethrottle.cpp
index d0ae872..84733ba 100644
--- a/linden/indra/llmessage/llmessagethrottle.cpp
+++ b/linden/indra/llmessage/llmessagethrottle.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -37,8 +37,18 @@
 #include "llframetimer.h"
 
 // This is used for the stl search_n function.
+#if _MSC_VER >= 1500 // VC9 has a bug in search_n
+struct eq_message_throttle_entry : public std::binary_function< LLMessageThrottleEntry, LLMessageThrottleEntry, bool >
+{
+        bool operator()(const LLMessageThrottleEntry& a, const LLMessageThrottleEntry& b) const
+        {
+                return a.getHash() == b.getHash();
+        }
+};
+#else
 bool eq_message_throttle_entry(LLMessageThrottleEntry a, LLMessageThrottleEntry b)
-                { return a.getHash() == b.getHash(); }
+                { return a.getHash() == b.getHash(); }
+#endif
 
 const U64 SEC_TO_USEC = 1000000;
                 
@@ -113,9 +123,14 @@ BOOL LLMessageThrottle::addViewerAlert(const LLUUID& to, const char* mesg)
         LLMessageThrottleEntry entry(hash, LLFrameTimer::getTotalTime());
 
         // Check if this message is already in the list.
-        message_list_iterator_t found = std::search_n(message_list->begin(), message_list->end(),
-                                                                                                  1, entry, eq_message_throttle_entry);
-
+#if _MSC_VER >= 1500 // VC9 has a bug in search_n
+        // SJB: This *should* work but has not been tested yet *TODO: Test!
+        message_list_iterator_t found = std::find_if(message_list->begin(), message_list->end(),
+                                                                                                 std::bind2nd(eq_message_throttle_entry(), entry));
+#else
+        message_list_iterator_t found = std::search_n(message_list->begin(), message_list->end(),
+                                                                                                  1, entry, eq_message_throttle_entry);
+#endif
         if (found == message_list->end())
         {
                 // This message was not found.  Add it to the list.
@@ -142,9 +157,15 @@ BOOL LLMessageThrottle::addAgentAlert(const LLUUID& agent, const LLUUID& task, c
         LLMessageThrottleEntry entry(hash, LLFrameTimer::getTotalTime());
 
         // Check if this message is already in the list.
+#if _MSC_VER >= 1500 // VC9 has a bug in search_n
+        // SJB: This *should* work but has not been tested yet *TODO: Test!
+        message_list_iterator_t found = std::find_if(message_list->begin(), message_list->end(),
+                                                                                                 std::bind2nd(eq_message_throttle_entry(), entry));
+#else
         message_list_iterator_t found = std::search_n(message_list->begin(), message_list->end(),
                                                                                                   1, entry, eq_message_throttle_entry);
-
+#endif
+        
         if (found == message_list->end())
         {
                 // This message was not found.  Add it to the list.