From 4fc12def1e921848ab9f965b2e8e538761d4c966 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 15 May 2015 15:04:28 -0700
Subject: Group voice chat coro

---
 indra/newview/llvoicechannel.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llvoicechannel.h')

diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index fed44974fd..13d73a51f8 100755
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -29,6 +29,8 @@
 
 #include "llhandle.h"
 #include "llvoiceclient.h"
+#include "lleventcoro.h"
+#include "llcoros.h"
 
 class LLPanel;
 
@@ -157,6 +159,8 @@ protected:
 	virtual void setState(EState state);
 
 private:
+    void voiceCallCapCoro(LLCoros::self& self, std::string &url);
+
 	U32 mRetries;
 	BOOL mIsRetrying;
 };
-- 
cgit v1.2.3


From a4741cecb2112f418c1d98ca63a261e707a856c3 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Mon, 18 May 2015 16:18:07 -0700
Subject: Changed Avatar picker to use coroutine for find. Fixed a stray
 reference (&) on URL that had crept into some coroutine definitions.

---
 indra/newview/llvoicechannel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llvoicechannel.h')

diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index 13d73a51f8..0dac0b1f6a 100755
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -159,7 +159,7 @@ protected:
 	virtual void setState(EState state);
 
 private:
-    void voiceCallCapCoro(LLCoros::self& self, std::string &url);
+    void voiceCallCapCoro(LLCoros::self& self, std::string url);
 
 	U32 mRetries;
 	BOOL mIsRetrying;
-- 
cgit v1.2.3


From b262ded7e0cf21314524bf702b0e4fe28a3c3060 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Wed, 1 Jul 2015 18:33:29 -0400
Subject: MAINT-5351: Remove 'self' parameter from coroutine functions.
 lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
 builds clean, but the resulting viewer is as yet untested.

---
 indra/newview/llvoicechannel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llvoicechannel.h')

diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index 0dac0b1f6a..ef15b2c79e 100755
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -159,7 +159,7 @@ protected:
 	virtual void setState(EState state);
 
 private:
-    void voiceCallCapCoro(LLCoros::self& self, std::string url);
+    void voiceCallCapCoro(std::string url);
 
 	U32 mRetries;
 	BOOL mIsRetrying;
-- 
cgit v1.2.3


From 247eb0c9c3418c10be8f2a0e3c8116758efa702f Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Tue, 7 Jul 2015 19:41:27 +0100
Subject: Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5

---
 indra/newview/llvoicechannel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llvoicechannel.h')

diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index ef15b2c79e..0dac0b1f6a 100755
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -159,7 +159,7 @@ protected:
 	virtual void setState(EState state);
 
 private:
-    void voiceCallCapCoro(std::string url);
+    void voiceCallCapCoro(LLCoros::self& self, std::string url);
 
 	U32 mRetries;
 	BOOL mIsRetrying;
-- 
cgit v1.2.3


From efa9a0f99c17b2b937120bcad6e3d45944122ed9 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 10 Jul 2015 19:30:10 -0400
Subject: Backed out changeset bab1000e1b2d: restore 'selfless' changes

---
 indra/newview/llvoicechannel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llvoicechannel.h')

diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index 0dac0b1f6a..ef15b2c79e 100755
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -159,7 +159,7 @@ protected:
 	virtual void setState(EState state);
 
 private:
-    void voiceCallCapCoro(LLCoros::self& self, std::string url);
+    void voiceCallCapCoro(std::string url);
 
 	U32 mRetries;
 	BOOL mIsRetrying;
-- 
cgit v1.2.3