diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-22 14:46:15 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-22 14:46:15 -0400 |
| commit | bfe759584f63c0587a2dc6a0086ad9d5b6c63a56 (patch) | |
| tree | 84653a1211908c7dd2ce5bc4877e79f8e6515099 /indra/newview/llpanelprofile.h | |
| parent | 62fc3ceaf5251458239f91192a05edc64bedf33b (diff) | |
| parent | 394f7b37f2ec05c7cfb32c350432886f1c493c85 (diff) | |
Merge branch 'develop' into marchcat/xcode-16
Diffstat (limited to 'indra/newview/llpanelprofile.h')
| -rw-r--r-- | indra/newview/llpanelprofile.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/llpanelprofile.h b/indra/newview/llpanelprofile.h index c207a4162a..ba00e12441 100644 --- a/indra/newview/llpanelprofile.h +++ b/indra/newview/llpanelprofile.h @@ -33,7 +33,6 @@ #include "llpanel.h" #include "llpanelavatar.h" #include "llmediactrl.h" -#include "llvoiceclient.h" // class LLPanelProfileClassifieds; // class LLTabContainer; @@ -70,7 +69,6 @@ class LLViewerFetchedTexture; class LLPanelProfileSecondLife : public LLPanelProfilePropertiesProcessorTab , public LLFriendObserver - , public LLVoiceClientStatusObserver { public: LLPanelProfileSecondLife(); @@ -89,10 +87,6 @@ public: */ void changed(U32 mask) override; - // Implements LLVoiceClientStatusObserver::onChange() to enable the call - // button when voice is available - void onChange(EStatusType status, const LLSD& channelInfo, bool proximal) override; - void setAvatarId(const LLUUID& avatar_id) override; bool postBuild() override; @@ -203,7 +197,6 @@ private: LLHandle<LLFloater> mFloaterTexturePickerHandle; bool mHasUnsavedDescriptionChanges; - bool mVoiceStatus; bool mWaitingForImageUpload; bool mAllowPublish; bool mHideAge; |