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

Merge remote-tracking branch 'melanie_t/master'

Browse Source
This commit is contained in:
Latif Khalifa
2013-04-16 17:35:44 +02:00
parent 97809b3a22 0909bf1133
commit e2a9d83b3e
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
indra/newview/hippofloaterxml.cpp
View File

@@ -40,6 +40,8 @@
#include <llradiogroup.h> #include <llradiogroup.h>
#include <lluictrlfactory.h> #include <lluictrlfactory.h>
#include "llavatarnamecache.h"
#include "llfloateravatarpicker.h"
#include "llviewerwindow.h" #include "llviewerwindow.h"
@@ -58,7 +60,7 @@ class HippoFloaterXmlImpl : public LLFloater
BOOL postBuild(); BOOL postBuild();
void onClose(bool quitting); void onClose(bool quitting);
static bool execute(LLUICtrl *ctrl, static bool execute(LLFloater *floater, LLUICtrl *ctrl,
const std::string &cmds, std::string::size_type &offset, const std::string &cmds, std::string::size_type &offset,
std::string &response); std::string &response);
@@ -218,7 +220,7 @@ void HippoFloaterXml::execute(const std::string &cmds)
if (token == "{") { if (token == "{") {
if (floater) { if (floater) {
std::string response; std::string response;
if (!floater->execute(floater, cmds, offset, response)) if (!floater->execute(floater, floater, cmds, offset, response))
break; break;
if (!response.empty()) if (!response.empty())
send_chat_from_viewer(response, CHAT_TYPE_WHISPER, CHANNEL); send_chat_from_viewer(response, CHAT_TYPE_WHISPER, CHANNEL);
@@ -275,6 +277,30 @@ static void notifyCallback(void *c)
send_chat_from_viewer(msg, CHAT_TYPE_WHISPER, CHANNEL); send_chat_from_viewer(msg, CHAT_TYPE_WHISPER, CHANNEL);
} }
void callbackAvatarPick(void *c, const uuid_vec_t& ids, const std::vector<LLAvatarName>& names)
{
LLUICtrl *ctrl = (LLUICtrl *)c;
LLUUID id = ids[0];
std::string msg = "PICKER:";
msg += ctrl->getName();
msg += ':';
msg += id.asString();
msg += ':';
msg += names[0].getCompleteName();
send_chat_from_viewer(msg, CHAT_TYPE_WHISPER, CHANNEL);
}
static void pickerCallback(void *c, void *f)
{
LLUICtrl *ctrl = (LLUICtrl *)c;
HippoFloaterXmlImpl* floaterp = (HippoFloaterXmlImpl*)f;
floaterp->addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&callbackAvatarPick, ctrl, _1, _2), FALSE, TRUE));
//send_chat_from_viewer(msg, CHAT_TYPE_WHISPER, CHANNEL);
}
void HippoFloaterXmlImpl::onClose(bool quitting) void HippoFloaterXmlImpl::onClose(bool quitting)
{ {
if (mIsNotifyOnClose) if (mIsNotifyOnClose)
@@ -283,11 +309,10 @@ void HippoFloaterXmlImpl::onClose(bool quitting)
LLFloater::onClose(quitting); LLFloater::onClose(quitting);
} }
// ******************************************************************** // ********************************************************************
// execute commands on instance // execute commands on instance
bool HippoFloaterXmlImpl::execute(LLUICtrl *ctrl, bool HippoFloaterXmlImpl::execute(LLFloater *floater, LLUICtrl *ctrl,
const std::string &cmds, std::string::size_type &offset, const std::string &cmds, std::string::size_type &offset,
std::string &response) std::string &response)
{ {
@@ -313,7 +338,7 @@ bool HippoFloaterXmlImpl::execute(LLUICtrl *ctrl,
if (!child) return false; if (!child) return false;
if (!cmdGetToken(cmds, offset, token)) return false; if (!cmdGetToken(cmds, offset, token)) return false;
if (token != "{") return false; if (token != "{") return false;
if (!execute(child, cmds, offset, response)) if (!execute(floater, child, cmds, offset, response))
return false; return false;
} else if (key == "setValue") { } else if (key == "setValue") {
ctrl->setValue(value); ctrl->setValue(value);
@@ -331,6 +356,14 @@ bool HippoFloaterXmlImpl::execute(LLUICtrl *ctrl,
else else
ctrl->setCommitCallback(0); ctrl->setCommitCallback(0);
} }
} else if (key == "picker") {
bool set = (value != "0");
if (!dynamic_cast<HippoFloaterXmlImpl*>(ctrl)) {
if (set)
ctrl->setCommitCallback(boost::bind(&pickerCallback, _1, floater), ctrl);
else
ctrl->setCommitCallback(0);
}
} }
} }
} }

1
indra/newview/llpanelpermissions.cpp
View File

@@ -181,7 +181,6 @@ LLPanelPermissions::~LLPanelPermissions()
// virtual // virtual
void LLPanelPermissions::handleVisibilityChange(BOOL new_visibility) void LLPanelPermissions::handleVisibilityChange(BOOL new_visibility)
{ {
llwarns << "Hey, does this warning show whenever you switch to this tab?" << llendl; // Find out if the addition of this function is actually worthwhile.
if (new_visibility) if (new_visibility)
refresh(); refresh();
LLPanel::handleVisibilityChange(new_visibility); LLPanel::handleVisibilityChange(new_visibility);