Merge branch 'next' of git://github.com/imprudence/imprudence into next

Removed the new "Set your own Imprudence tag colour feature".  Should check though, might be bits left that where not obvious.

Conflicts:
	.gitignore
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/llvoavatar.cpp
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/panel_login.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerinfo.cpp

The usual branding conflicts.

1 files changed, 12 insertions, 0 deletions

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 4b5d3ce..c5b5e99 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -58,11 +58,13 @@
 #include "llimview.h" // for LLIMMgr
 #include "llimpanel.h" // for LLVoiceChannel
 #include "llparcel.h"
+#include "llstartup.h"
 #include "llviewerparcelmgr.h"
 #include "llfirstuse.h"
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
 #include "hippolimits.h"
+#include "hippogridmanager.h"
 
 #include "llfloaterfriends.h"  //VIVOX, inorder to refresh communicate panel
 #include "llfloaterchat.h"              // for LLFloaterChat::addChat()
@@ -76,6 +78,7 @@
 // for MD5 hash
 #include "llmd5.h"
 
+
 #define USE_SESSION_GROUPS 0
 
 static bool sConnectingToAgni = false;
@@ -7148,6 +7151,15 @@ void LLVoiceClient::avatarNameResolved(const LLUUID &id, const std::string &name
         }
 }
 
+//static 
+bool LLVoiceClient::needsVivoxLicense()
+{
+        // assumes we're always using slvoice.exe on Second Life
+        bool needs_license = !gSavedSettings.getBOOL("VivoxLicenseAccepted") && 
+                                                gHippoGridManager->getCurrentGrid()->isSecondLife();
+        return needs_license;
+}
+
 class LLViewerParcelVoiceInfo : public LLHTTPNode
 {
         virtual void post(