diff options
author | Merov Linden <merov@lindenlab.com> | 2014-05-07 07:42:48 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-05-07 07:42:48 -0700 |
commit | 3eb53f5426a710b0403a84bd6849fe48553194eb (patch) | |
tree | b3670f45bddb04cea3a979920e0ae740735f255f /indra | |
parent | 8dae4bc222d1b0744254442ab0b26538285341de (diff) |
Fix Windows build issues: change in onVisibility() profile needed to percolate to SL Share panels
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llfloaterfacebook.cpp | 7 | ||||
-rw-r--r-- | indra/newview/llfloaterfacebook.h | 4 | ||||
-rw-r--r-- | indra/newview/llfloaterflickr.cpp | 7 | ||||
-rw-r--r-- | indra/newview/llfloaterflickr.h | 4 | ||||
-rw-r--r-- | indra/newview/llfloatertwitter.cpp | 7 | ||||
-rw-r--r-- | indra/newview/llfloatertwitter.h | 4 |
6 files changed, 12 insertions, 21 deletions
diff --git a/indra/newview/llfloaterfacebook.cpp b/indra/newview/llfloaterfacebook.cpp index b421fa0e55..9e3f917eae 100644 --- a/indra/newview/llfloaterfacebook.cpp +++ b/indra/newview/llfloaterfacebook.cpp @@ -335,9 +335,8 @@ LLSnapshotLivePreview* LLFacebookPhotoPanel::getPreviewView() return previewp; } -void LLFacebookPhotoPanel::onVisibilityChange(const LLSD& new_visibility) +void LLFacebookPhotoPanel::onVisibilityChange(BOOL visible) { - bool visible = new_visibility.asBoolean(); if (visible) { if (mPreviewHandle.get()) @@ -931,10 +930,8 @@ void LLFacebookAccountPanel::draw() LLPanel::draw(); } -void LLFacebookAccountPanel::onVisibilityChange(const LLSD& new_visibility) +void LLFacebookAccountPanel::onVisibilityChange(BOOL visible) { - bool visible = new_visibility.asBoolean(); - if(visible) { LLEventPumps::instance().obtain("FacebookConnectState").stopListening("LLFacebookAccountPanel"); diff --git a/indra/newview/llfloaterfacebook.h b/indra/newview/llfloaterfacebook.h index fd5d3d0635..34356412d6 100644 --- a/indra/newview/llfloaterfacebook.h +++ b/indra/newview/llfloaterfacebook.h @@ -66,7 +66,7 @@ public: void draw(); LLSnapshotLivePreview* getPreviewView(); - void onVisibilityChange(const LLSD& new_visibility); + void onVisibilityChange(BOOL new_visibility); void onClickBigPreview(); void onClickNewSnapshot(); void onSend(); @@ -155,7 +155,7 @@ public: void draw(); private: - void onVisibilityChange(const LLSD& new_visibility); + void onVisibilityChange(BOOL new_visibility); bool onFacebookConnectStateChange(const LLSD& data); bool onFacebookConnectInfoChange(); void onConnect(); diff --git a/indra/newview/llfloaterflickr.cpp b/indra/newview/llfloaterflickr.cpp index 99b275fd0b..4e6d98ecfa 100644 --- a/indra/newview/llfloaterflickr.cpp +++ b/indra/newview/llfloaterflickr.cpp @@ -226,9 +226,8 @@ LLSnapshotLivePreview* LLFlickrPhotoPanel::getPreviewView() return previewp; } -void LLFlickrPhotoPanel::onVisibilityChange(const LLSD& new_visibility) +void LLFlickrPhotoPanel::onVisibilityChange(BOOL visible) { - bool visible = new_visibility.asBoolean(); if (visible) { if (mPreviewHandle.get()) @@ -563,10 +562,8 @@ void LLFlickrAccountPanel::draw() LLPanel::draw(); } -void LLFlickrAccountPanel::onVisibilityChange(const LLSD& new_visibility) +void LLFlickrAccountPanel::onVisibilityChange(BOOL visible) { - bool visible = new_visibility.asBoolean(); - if(visible) { LLEventPumps::instance().obtain("FlickrConnectState").stopListening("LLFlickrAccountPanel"); diff --git a/indra/newview/llfloaterflickr.h b/indra/newview/llfloaterflickr.h index 7a5453d32a..ba27c9a3d8 100644 --- a/indra/newview/llfloaterflickr.h +++ b/indra/newview/llfloaterflickr.h @@ -47,7 +47,7 @@ public: void draw(); LLSnapshotLivePreview* getPreviewView(); - void onVisibilityChange(const LLSD& new_visibility); + void onVisibilityChange(BOOL new_visibility); void onClickNewSnapshot(); void onClickBigPreview(); void onSend(); @@ -93,7 +93,7 @@ public: void draw(); private: - void onVisibilityChange(const LLSD& new_visibility); + void onVisibilityChange(BOOL new_visibility); bool onFlickrConnectStateChange(const LLSD& data); bool onFlickrConnectInfoChange(); void onConnect(); diff --git a/indra/newview/llfloatertwitter.cpp b/indra/newview/llfloatertwitter.cpp index f20d886b7f..78e9259919 100644 --- a/indra/newview/llfloatertwitter.cpp +++ b/indra/newview/llfloatertwitter.cpp @@ -229,9 +229,8 @@ LLSnapshotLivePreview* LLTwitterPhotoPanel::getPreviewView() return previewp; } -void LLTwitterPhotoPanel::onVisibilityChange(const LLSD& new_visibility) +void LLTwitterPhotoPanel::onVisibilityChange(BOOL visible) { - bool visible = new_visibility.asBoolean(); if (visible) { if (mPreviewHandle.get()) @@ -592,10 +591,8 @@ void LLTwitterAccountPanel::draw() LLPanel::draw(); } -void LLTwitterAccountPanel::onVisibilityChange(const LLSD& new_visibility) +void LLTwitterAccountPanel::onVisibilityChange(BOOL visible) { - bool visible = new_visibility.asBoolean(); - if(visible) { LLEventPumps::instance().obtain("TwitterConnectState").stopListening("LLTwitterAccountPanel"); diff --git a/indra/newview/llfloatertwitter.h b/indra/newview/llfloatertwitter.h index 659ab7779a..f07ec2ca2f 100644 --- a/indra/newview/llfloatertwitter.h +++ b/indra/newview/llfloatertwitter.h @@ -46,7 +46,7 @@ public: void draw(); LLSnapshotLivePreview* getPreviewView(); - void onVisibilityChange(const LLSD& new_visibility); + void onVisibilityChange(BOOL new_visibility); void onAddLocationToggled(); void onAddPhotoToggled(); void onClickBigPreview(); @@ -97,7 +97,7 @@ public: void draw(); private: - void onVisibilityChange(const LLSD& new_visibility); + void onVisibilityChange(BOOL new_visibility); bool onTwitterConnectStateChange(const LLSD& data); bool onTwitterConnectInfoChange(); void onConnect(); |