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

Fix a ton of run-time warnings about UI.

Browse Source 
Cleans up some related code, probably looks nicer with space changes off.. though this is a pretty straightforward change.
Comments out code that still exists in xmls or might likely be added in future.
Each piece tested quite a bit.
This commit is contained in:
Lirusaito
2013-03-05 20:20:59 -05:00
parent 79f6883bdf
commit db39bab95b
39 changed files with 198 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llchatbar.cpp
View File

@@ -87,7 +87,7 @@ const F32 AGENT_TYPING_TIMEOUT = 5.f; // seconds
LLChatBar *gChatBar = NULL;
// legacy calllback glue
void toggleChatHistory(void* user_data);
void toggleChatHistory(LLUICtrl*, const LLSD&);
//void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel);
// [RLVa:KB] - Checked: 2009-07-07 (RLVa-1.0.0d) | Modified: RLVa-0.2.2a
void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channel);
@@ -137,19 +137,16 @@ LLChatBar::~LLChatBar()
BOOL LLChatBar::postBuild()
{
childSetAction("History", toggleChatHistory, this);
getChild<LLUICtrl>("Say")->setCommitCallback(boost::bind(&LLChatBar::onClickSay, this, _1));
if (LLUICtrl* history_ctrl = findChild<LLUICtrl>("History"))
history_ctrl->setCommitCallback(toggleChatHistory);
if (LLUICtrl* say_ctrl = getChild<LLUICtrl>("Say"))
say_ctrl->setCommitCallback(boost::bind(&LLChatBar::onClickSay, this, _1));
// attempt to bind to an existing combo box named gesture
setGestureCombo(getChild<LLComboBox>( "Gesture"));
if (LLComboBox* gesture_combo = findChild<LLComboBox>("Gesture"))
setGestureCombo(gesture_combo);
LLButton * sayp = getChild<LLButton>("Say");
if(sayp)
{
setDefaultBtn(sayp);
}
mInputEditor = getChild<LLLineEditor>("Chat Editor");
mInputEditor = findChild<LLLineEditor>("Chat Editor");
if (mInputEditor)
{
mInputEditor->setCallbackUserData(this);
@@ -165,9 +162,6 @@ BOOL LLChatBar::postBuild()
mInputEditor->setEnableLineHistory(TRUE);
}
mHistoryBtn.connect(this,"History");
mSayBtn.connect(this,"Say");
mIsBuilt = TRUE;
return TRUE;
@@ -231,9 +225,11 @@ void LLChatBar::refresh()
gAgent.stopTyping();
}
mHistoryBtn->setValue(LLFloaterChat::instanceVisible(LLSD()));
if (LLUICtrl* history_ctrl = findChild<LLUICtrl>("History"))
history_ctrl->setValue(LLFloaterChat::instanceVisible());
mSayBtn->setEnabled(mInputEditor->getText().size() > 0);
if (LLUICtrl* say_ctrl = getChild<LLUICtrl>("Say"))
say_ctrl->setEnabled(mInputEditor->getText().size() > 0);
//childSetEnabled("Shout", mInputEditor->getText().size() > 0); createDummyWidget Making Dummy -HgB
}
@@ -897,7 +893,7 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl)
}
}
void toggleChatHistory(void* user_data)
void toggleChatHistory(LLUICtrl* ctrl, const LLSD&)
{
LLFloaterChat::toggleInstance(LLSD());
}