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

Conflicts (manually merged):
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llvfs/lldir.cpp
	linden/indra/llvfs/lldir_mac.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/Info-meta-impy.plist
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/packaging/mac/Info.plist.in
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerversion.cpp
	linden/indra/newview/viewerversion.h
	linden/install.xml

Also some post merge tweaks.

1 files changed, 15 insertions, 4 deletions

diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index 9ef3be9..f5c6d87 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -424,11 +424,15 @@ static	void updatePosition(void);
                         const std::string& account_name,
                         const std::string& password,
                         const std::string& voice_sip_uri_hostname,
-                        const std::string& voice_account_server_uri);
+                        const std::string& voice_account_server_uri,
+                        const LLUUID& response_id);
+
                 void loginSendMessage();
                 void logout();
                 void logoutSendMessage();
 
+                void loadDaemon(const std::string& scheme);
+
                 void accountListBlockRulesSendMessage();
                 void accountListAutoAcceptRulesSendMessage();
                 
@@ -474,7 +478,8 @@ static	void updatePosition(void);
                         const std::string &credentials);
                 void setSpatialChannel(
                         const std::string &uri,
-                        const std::string &credentials);
+                        const std::string &credentials,
+                        const LLUUID& response_id);
                 // start a voice session with the specified user
                 void callUser(const LLUUID &uuid);
                 
@@ -519,7 +524,7 @@ static	void updatePosition(void);
 
                 void close();
                 void start();
-                
+                void setPIRCapResponseID(const LLUUID& response_id){ mPIRCapResponseID = response_id; }
         private:
 
                 // internal state for a simple state machine.  This is used to deal with the asynchronous nature of some of the messages.
@@ -595,7 +600,13 @@ static	void updatePosition(void);
                 std::string mAccountDisplayName;
                 std::string mAccountFirstName;
                 std::string mAccountLastName;
-                                
+
+                bool mAccountActive;
+                bool mVAPRequested;
+                std::string mDaemonScheme;
+                LLUUID mVAPCapResponseID;
+                LLUUID mPIRCapResponseID;
+
                 bool mTuningMode;
                 float mTuningEnergy;
                 std::string mTuningAudioFile;