Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polished the voice anchor a little more

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-04 22:58:13 -03:00
parent 629d77aff7
commit d6e810443e
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llvoiceclient.h
View File

@@ -176,6 +176,10 @@ static void updatePosition(void);
bool channelFromRegion(LLViewerRegion *region, std::string &name); bool channelFromRegion(LLViewerRegion *region, std::string &name);
void leaveChannel(void); // call this on logout or teleport begin 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. void setMuteMic(bool muted); // Use this to mute the local mic (for when the client is minimized, etc), ignoring user PTT state.
void setUserPTTState(bool ptt); void setUserPTTState(bool ptt);
@@ -648,10 +652,6 @@ static void updatePosition(void);
bool mCaptureDeviceDirty; bool mCaptureDeviceDirty;
bool mRenderDeviceDirty; 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 switchChannel(std::string uri = std::string(), bool spatial = true, bool no_reconnect = false, bool is_p2p = false, std::string hash = "");
void joinSession(sessionState *session); void joinSession(sessionState *session);

5
indra/newview/llvoiceremotectrl.cpp
View File

@@ -252,6 +252,11 @@ void LLVoiceRemoteCtrl::onClickPosLock(void* user_data)
{ {
gVoiceClient->setPosLocked(!gVoiceClient->getPosLocked()); gVoiceClient->setPosLocked(!gVoiceClient->getPosLocked());
llwarns << gVoiceClient->getPosLocked() << llendl; 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) void LLVoiceRemoteCtrl::onClickSpeakers(void *user_data)