From 64ee599c5b54496853025df6f609764acb846248 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 25 Sep 2009 19:54:02 -0700 Subject: Temporarily disable chat channel control in chat history until it's fixed --- linden/indra/newview/llchatbar.cpp | 2 +- linden/indra/newview/llfloaterchat.cpp | 2 ++ linden/indra/newview/llprefschat.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp index 1de3690..46024ab 100644 --- a/linden/indra/newview/llchatbar.cpp +++ b/linden/indra/newview/llchatbar.cpp @@ -217,7 +217,7 @@ void LLChatBar::refresh() childSetValue("History", LLFloaterChat::instanceVisible(LLSD())); - childSetValue("channel_control",( 1.f * ((S32)(getChild("channel_control")->get()))) ); + //childSetValue("channel_control",( 1.f * ((S32)(getChild("channel_control")->get()))) ); childSetEnabled("Say", mInputEditor->getText().size() > 0); childSetEnabled("Shout", mInputEditor->getText().size() > 0); diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp index 1f51a21..1f34ad0 100644 --- a/linden/indra/newview/llfloaterchat.cpp +++ b/linden/indra/newview/llfloaterchat.cpp @@ -108,6 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed) childSetVisible("Chat History Editor with mute",FALSE); childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this); setDefaultBtn("Chat"); + + //toggleHistoryChannelControl(); temporarily disable until working } LLFloaterChat::~LLFloaterChat() diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp index f3b7278..6e55cda 100644 --- a/linden/indra/newview/llprefschat.cpp +++ b/linden/indra/newview/llprefschat.cpp @@ -194,7 +194,7 @@ void LLPrefsChatImpl::apply() if (gChatBar) { gChatBar->toggleChannelControl(); - LLFloaterChat::toggleHistoryChannelControl(); + //LLFloaterChat::toggleHistoryChannelControl(); temporarily disable until working } mChatChannel = chan_check; } -- cgit v1.1 From 3d4e223fd343d1b436f0dacdce969e548ecb4e79 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 25 Sep 2009 21:12:46 -0700 Subject: Cleaned up channel control code in llchatbar.cpp some --- linden/indra/newview/llchatbar.cpp | 18 ++++++++++-------- linden/indra/newview/llchatbar.h | 4 +++- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp index 46024ab..8c22931 100644 --- a/linden/indra/newview/llchatbar.cpp +++ b/linden/indra/newview/llchatbar.cpp @@ -102,7 +102,7 @@ private: LLChatBar::LLChatBar() : LLPanel(LLStringUtil::null, LLRect(), BORDER_NO), - mChannelControl(FALSE), + mChanCtrlEnabled(FALSE), mInputEditor(NULL), mGestureLabelTimer(), mLastSpecialChatChannel(0), @@ -156,6 +156,8 @@ BOOL LLChatBar::postBuild() mInputEditor->setEnableLineHistory(TRUE); } + mChannelControl = getChild("channel_control"); + toggleChannelControl(); mIsBuilt = TRUE; @@ -217,7 +219,7 @@ void LLChatBar::refresh() childSetValue("History", LLFloaterChat::instanceVisible(LLSD())); - //childSetValue("channel_control",( 1.f * ((S32)(getChild("channel_control")->get()))) ); + //childSetValue("channel_control",( 1.f * ((S32)(mChannelControl->get()))) ); childSetEnabled("Say", mInputEditor->getText().size() > 0); childSetEnabled("Shout", mInputEditor->getText().size() > 0); @@ -378,7 +380,7 @@ LLWString LLChatBar::stripChannelNumber(const LLWString &mesg, S32* channel) } else { - if (!mChannelControl) + if (!mChanCtrlEnabled) { // This is normal chat. *channel = 0; @@ -398,7 +400,7 @@ void LLChatBar::sendChat( EChatType type ) // store sent line in history, duplicates will get filtered if (mInputEditor) mInputEditor->updateHistory(); // Check if this is destined for another channel - S32 channel = mChannelControl ? (S32)(getChild("channel_control")->get()) : 0; + S32 channel = mChanCtrlEnabled ? (S32)(mChannelControl->get()) : 0; stripChannelNumber(text, &channel); @@ -440,9 +442,9 @@ void LLChatBar::sendChat( EChatType type ) void LLChatBar::toggleChannelControl() { LLRect input_rect = mInputEditor->getRect(); - S32 chan_width = getChild("channel_control")->getRect().getWidth(); + S32 chan_width = mChannelControl->getRect().getWidth(); BOOL visible = gSavedSettings.getBOOL("ChatChannelSelect"); - BOOL control = getChild("channel_control")->getVisible(); + BOOL control = mChannelControl->getVisible(); if (visible && !control) { @@ -459,7 +461,7 @@ void LLChatBar::toggleChannelControl() childSetVisible("channel_control", visible); childSetEnabled("channel_control", visible); - mChannelControl = visible; + mChanCtrlEnabled = visible; } @@ -615,7 +617,7 @@ void LLChatBar::sendChatFromViewer(const std::string &utf8text, EChatType type, void LLChatBar::sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate) { // Look for "/20 foo" channel chats. - S32 channel = mChannelControl ? (S32)(getChild("channel_control")->get()) : 0; + S32 channel = mChanCtrlEnabled ? (S32)(mChannelControl->get()) : 0; LLWString out_text = stripChannelNumber(wtext, &channel); std::string utf8_out_text = wstring_to_utf8str(out_text); diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h index 53ac233..96961ae 100644 --- a/linden/indra/newview/llchatbar.h +++ b/linden/indra/newview/llchatbar.h @@ -43,6 +43,7 @@ class LLUUID; class LLFrameTimer; class LLChatBarGestureObserver; class LLComboBox; +class LLSpinCtrl; class LLChatBar : public LLPanel @@ -113,7 +114,8 @@ protected: LLChatBarGestureObserver* mObserver; private: - BOOL mChannelControl; + BOOL mChanCtrlEnabled; + LLSpinCtrl* mChannelControl; }; extern LLChatBar *gChatBar; -- cgit v1.1 From 031e12d8ecdfefebd8c236c5f4dc50fb8b82efae Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 26 Sep 2009 14:54:22 -0500 Subject: Removed redundant warning about export perms. --- linden/indra/newview/llviewermenu.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 8a92963..91caa72 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -2324,7 +2324,6 @@ class LLObjectEnableExport : public view_listener_t { if(gAgent.getID()!=node->mPermissions->getCreator()) { - llwarns<<"Incorrect permission to export"< - + -- cgit v1.1 From 63587255f648f1a05298db9d2fb3f4969e615c74 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 26 Sep 2009 17:40:59 -0700 Subject: Added missing FloaterAnimationListRect to settings.xml --- linden/indra/newview/app_settings/settings.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 087c92f..d0370cf 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -2776,6 +2776,22 @@ 0 + FloaterAnimationListRect + + Comment + Rectangle for Animation List + Persist + 1 + Type + Rect + Value + + 0 + 275 + 1000 + 0 + + FloaterAudioVolumeRect Comment -- cgit v1.1