polished the voice anchor a little more
This commit is contained in:
@@ -3616,7 +3616,7 @@ void LLVoiceClient::sendFriendsListUpdates()
|
||||
<< "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Account.BuddySet.1\">"
|
||||
<< "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
|
||||
<< "<BuddyURI>" << buddy->mURI << "</BuddyURI>"
|
||||
<< "<DisplayName>" << buddy->mDisplayName << "</DisplayName>"
|
||||
<< "<DisplayName>" << buddy->mDisplayName << "</DisplayName>"
|
||||
<< "<BuddyData></BuddyData>" // Without this, SLVoice doesn't seem to parse the command.
|
||||
<< "<GroupID>0</GroupID>"
|
||||
<< "</Request>\n\n\n";
|
||||
|
||||
@@ -175,6 +175,10 @@ static void updatePosition(void);
|
||||
void setAvatarPosition(const LLVector3d &position, const LLVector3 &velocity, const LLMatrix3 &rot);
|
||||
bool channelFromRegion(LLViewerRegion *region, std::string &name);
|
||||
void leaveChannel(void); // call this on logout or teleport begin
|
||||
|
||||
// This should be called when the code detects we have changed parcels.
|
||||
// It initiates the call to the server that gets the parcel channel.
|
||||
void parcelChanged();
|
||||
|
||||
|
||||
void setMuteMic(bool muted); // Use this to mute the local mic (for when the client is minimized, etc), ignoring user PTT state.
|
||||
@@ -648,10 +652,6 @@ static void updatePosition(void);
|
||||
bool mCaptureDeviceDirty;
|
||||
bool mRenderDeviceDirty;
|
||||
|
||||
// This should be called when the code detects we have changed parcels.
|
||||
// It initiates the call to the server that gets the parcel channel.
|
||||
void parcelChanged();
|
||||
|
||||
void switchChannel(std::string uri = std::string(), bool spatial = true, bool no_reconnect = false, bool is_p2p = false, std::string hash = "");
|
||||
void joinSession(sessionState *session);
|
||||
|
||||
|
||||
@@ -252,6 +252,11 @@ void LLVoiceRemoteCtrl::onClickPosLock(void* user_data)
|
||||
{
|
||||
gVoiceClient->setPosLocked(!gVoiceClient->getPosLocked());
|
||||
llwarns << gVoiceClient->getPosLocked() << llendl;
|
||||
|
||||
if(!gVoiceClient->getPosLocked())
|
||||
{
|
||||
gVoiceClient->parcelChanged(); //force it to get a new SIP url based on our actual location
|
||||
}
|
||||
}
|
||||
|
||||
void LLVoiceRemoteCtrl::onClickSpeakers(void *user_data)
|
||||
|
||||
Reference in New Issue
Block a user