diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 382fd7955..e82bf9e36 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1308,7 +1308,7 @@ This should be as low as possible, but too low may break functionality Value 0 - AntiSpamNotFriends + AntiSpamNotFriend Comment When true, dialogs from friends will not be blocked unless the _NACL_Antispam is true. diff --git a/indra/newview/lfsimfeaturehandler.h b/indra/newview/lfsimfeaturehandler.h index 83acdd95a..46bc509f8 100644 --- a/indra/newview/lfsimfeaturehandler.h +++ b/indra/newview/lfsimfeaturehandler.h @@ -20,15 +20,14 @@ #include "llsingleton.h" -template +template > class SignaledType { public: SignaledType() : mValue() {} SignaledType(Type b) : mValue(b) {} - template - boost::signals2::connection connect(Slot slot) { return mSignal.connect(slot); } + boost::signals2::connection connect(const typename Signal::slot_type& slot) { return mSignal.connect(slot); } SignaledType& operator =(Type val) { @@ -42,7 +41,7 @@ public: operator Type() const { return mValue; } private: - boost::signals2::signal mSignal; + Signal mSignal; Type mValue; }; diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 36b7265b6..302c4d153 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -372,7 +372,7 @@ namespace { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLFloaterAvatarList::instance().focusOnPrev(userdata); + LLFloaterAvatarList::instance().focusOnPrev(userdata.asInteger()); return true; } }; @@ -381,7 +381,7 @@ namespace { bool handleEvent(LLPointer event, const LLSD& userdata) { - LLFloaterAvatarList::instance().focusOnNext(userdata); + LLFloaterAvatarList::instance().focusOnNext(userdata.asInteger()); return true; } }; diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 6c8b59273..fa9f8a326 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -187,12 +187,12 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, reshape(rect.getWidth(), rect.getHeight()); - LLComboBox* name_combo = sInstance->getChild("name_combo"); - name_combo->setCommitCallback(boost::bind(LLPanelLogin::onSelectLoginEntry, _1, this)); - name_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onLoginComboLostFocus, this, name_combo)); - name_combo->setPrevalidate(LLLineEditor::prevalidatePrintableNotPipe); - name_combo->setSuppressTentative(true); - name_combo->setSuppressAutoComplete(true); + LLComboBox* username_combo(getChild("username_combo")); + username_combo->setCommitCallback(boost::bind(LLPanelLogin::onSelectLoginEntry, _1, this)); + username_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onLoginComboLostFocus, this, username_combo)); + username_combo->setPrevalidate(LLLineEditor::prevalidatePrintableNotPipe); + username_combo->setSuppressTentative(true); + username_combo->setSuppressAutoComplete(true); childSetCommitCallback("remember_name_check", onNameCheckChanged); @@ -349,7 +349,7 @@ void LLPanelLogin::setLoginHistory(LLSavedLogins const& login_history) { sInstance->mLoginHistoryData = login_history; - LLComboBox* login_combo = sInstance->getChild("name_combo"); + LLComboBox* login_combo = sInstance->getChild("username_combo"); llassert(login_combo); login_combo->clear(); @@ -531,7 +531,7 @@ void LLPanelLogin::setFields(const std::string& firstname, return; } - LLComboBox* login_combo = sInstance->getChild("name_combo"); + LLComboBox* login_combo = sInstance->getChild("username_combo"); llassert_always(firstname.find(' ') == std::string::npos); login_combo->setLabel(nameJoin(firstname, lastname, false)); @@ -572,10 +572,10 @@ void LLPanelLogin::setFields(const LLSavedLoginEntry& entry, bool takeFocus) LLCheckBoxCtrl* remember_pass_check = sInstance->getChild("remember_check"); std::string fullname = nameJoin(entry.getFirstName(), entry.getLastName(), entry.isSecondLife()); - LLComboBox* login_combo = sInstance->getChild("name_combo"); + LLComboBox* login_combo = sInstance->getChild("username_combo"); login_combo->setTextEntry(fullname); login_combo->resetTextDirty(); - //sInstance->childSetText("name_combo", fullname); + //sInstance->childSetText("username_combo", fullname); std::string grid = entry.getGrid(); //grid comes via LLSavedLoginEntry, which uses full grid names, not nicks @@ -615,7 +615,7 @@ void LLPanelLogin::getFields(std::string *firstname, return; } - nameSplit(sInstance->getChild("name_combo")->getTextEntry(), *firstname, *lastname); + nameSplit(sInstance->getChild("username_combo")->getTextEntry(), *firstname, *lastname); LLStringUtil::trim(*firstname); LLStringUtil::trim(*lastname); @@ -891,7 +891,7 @@ void LLPanelLogin::onClickConnect(void *) sInstance->setFocus(FALSE); std::string first, last, password; - if (nameSplit(sInstance->getChild("name_combo")->getTextEntry(), first, last)) + if (nameSplit(sInstance->getChild("username_combo")->getTextEntry(), first, last)) { // has both first and last name typed sInstance->mCallback(0, sInstance->mCallbackData); @@ -1040,7 +1040,7 @@ void LLPanelLogin::onSelectLoginEntry(LLUICtrl* ctrl, void* data) { if (sInstance) { - LLComboBox* combo = sInstance->getChild("name_combo"); + LLComboBox* combo = sInstance->getChild("username_combo"); if (ctrl == combo) { LLSD selected_entry = combo->getSelectedValue(); diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index e80c6ca06..0b0a6650a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3436,6 +3436,9 @@ void reset_login() gLoginMenuBarView->setEnabled( TRUE ); } + // Clear the console + if (gConsole) gConsole->clear(); + // Hide any other stuff LLFloaterMap::hideInstance(); } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 305f54dc1..1e978dfe6 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1716,8 +1716,8 @@ bool is_spam_filtered(const EInstantMessage& dialog, bool is_friend, bool is_own if (antispam_not_mine && is_owned_by_me) return false; - static LLCachedControl antispam_not_friends(gSavedSettings,"AntiSpamNotFriends"); - if (antispam_not_friends && is_friend) + static LLCachedControl antispam_not_friend(gSavedSettings,"AntiSpamNotFriend"); + if (antispam_not_friend && is_friend) return false; // Last, definitely filter @@ -8058,14 +8058,9 @@ void process_initiate_download(LLMessageSystem* msg, void**) void process_script_teleport_request(LLMessageSystem* msg, void**) { if (!gSavedSettings.getBOOL("ScriptsCanShowUI")) return; + // NaCl - Antispam - { - LLUUID object_id, owner_id; - msg->getUUID( "Data", "ObjectID", object_id); - msg->getUUID( "Data", "OwnerID", owner_id); - - if (owner_id.isNull() ? is_spam_filtered(IM_COUNT, LLAvatarActions::isFriend(object_id), object_id == gAgentID) : is_spam_filtered(IM_COUNT, LLAvatarActions::isFriend(owner_id), owner_id == gAgentID)) return; - } + if (is_spam_filtered(IM_COUNT, false, false)) return; // NaCl End std::string object_name; diff --git a/indra/newview/skins/default/xui/en-us/menu_radar.xml b/indra/newview/skins/default/xui/en-us/menu_radar.xml index 2ab9dd73b..5552f27c9 100644 --- a/indra/newview/skins/default/xui/en-us/menu_radar.xml +++ b/indra/newview/skins/default/xui/en-us/menu_radar.xml @@ -72,10 +72,10 @@ - + - + @@ -83,10 +83,10 @@ - + - + diff --git a/indra/newview/skins/default/xui/en-us/panel_login.xml b/indra/newview/skins/default/xui/en-us/panel_login.xml index d8879f6d2..b022dfc44 100644 --- a/indra/newview/skins/default/xui/en-us/panel_login.xml +++ b/indra/newview/skins/default/xui/en-us/panel_login.xml @@ -23,7 +23,7 @@