From 04decf22b9982aa8914024556ac11ce8c6f322a0 Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Mon, 20 Oct 2008 22:16:40 +0000 Subject: Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 RC5 secu-fix to 1.21.6 release. --- indra/llcommon/llversionviewer.h | 2 +- indra/llui/llscrolllistctrl.cpp | 3 +-- indra/newview/lleventpoll.cpp | 7 ++++++- indra/newview/llfloaterdaycycle.cpp | 1 - indra/newview/llfloaterregioninfo.cpp | 1 - indra/newview/llfloaterreporter.cpp | 23 ++++++++++++++++++---- indra/newview/llfloaterwater.cpp | 1 - indra/newview/llfloaterwindlight.cpp | 1 - .../skins/default/xui/fr/floater_gesture.xml | 4 ++-- .../default/xui/fr/floater_preview_gesture.xml | 2 +- .../skins/default/xui/fr/panel_group_general.xml | 4 ++-- .../skins/default/xui/fr/panel_group_notices.xml | 5 +++-- .../skins/default/xui/fr/panel_group_roles.xml | 4 ++-- .../default/xui/fr/panel_preferences_general.xml | 6 +++--- indra/newview/skins/default/xui/fr/strings.xml | 4 ++-- 15 files changed, 42 insertions(+), 26 deletions(-) diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index ab182b8b5d..092eadd303 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -34,7 +34,7 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 21; -const S32 LL_VERSION_PATCH = 5; +const S32 LL_VERSION_PATCH = 6; const S32 LL_VERSION_BUILD = 100000; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 275cc65976..ebfdda3027 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -88,8 +88,7 @@ struct SortScrollListItem } } - // make sure to keep order when sort_result == 0 - return sort_result <= 0; + return sort_result < 0; } typedef std::vector > sort_order_t; diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp index 49862e8112..d263569752 100644 --- a/indra/newview/lleventpoll.cpp +++ b/indra/newview/lleventpoll.cpp @@ -224,7 +224,12 @@ namespace // IMs, teleports, about land, selecing land, region crossing and more will all fail. // They are essentially disconnected from the region even though some things may still work. // Since things won't get better until they relog we force a disconnect now. - LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in."); + + // *NOTE:Mani - This force disconnect was causing logouts even when disconnected + // from neighboring regions. + // *FIX:Mani We may want to re enable forceDisconnect for the agents main region. + // *FIX:Mani If reimplemting Translate!!!! + // LLAppViewer::instance()->forceDisconnect("You have been disconnected from the region you were in."); } } diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp index 1a8c35b837..af42a92ed8 100644 --- a/indra/newview/llfloaterdaycycle.cpp +++ b/indra/newview/llfloaterdaycycle.cpp @@ -109,7 +109,6 @@ void LLFloaterDayCycle::onClickHelp(void* data) root_floater->addDependentFloater(dialogp); } } - delete xml_alert; } void LLFloaterDayCycle::initHelpBtn(const std::string& name, const std::string& xml_alert) diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index e5193b8314..737a2afbb7 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -542,7 +542,6 @@ void LLPanelRegionInfo::onClickHelp(void* data) { const std::string* xml_alert = (std::string*)data; gViewerWindow->alertXml(*xml_alert); - delete xml_alert; } ///////////////////////////////////////////////////////////////////////////// diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index aac453b13e..da435c9452 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -389,21 +389,36 @@ void LLFloaterReporter::onClickSend(void *userdata) // only show copyright alert for abuse reports if ( self->mReportType != BUG_REPORT ) { + const int IP_CONTENT_REMOVAL = 66; + const int IP_PERMISSONS_EXPLOIT = 37; + LLComboBox* combo = self->getChild( "category_combo"); + int category_value = combo->getSelectedValue().asInteger(); + if ( ! self->mCopyrightWarningSeen ) { + std::string details_lc = self->childGetText("details_edit"); LLStringUtil::toLower( details_lc ); std::string summary_lc = self->childGetText("summary_edit"); LLStringUtil::toLower( summary_lc ); if ( details_lc.find( "copyright" ) != std::string::npos || - summary_lc.find( "copyright" ) != std::string::npos ) + summary_lc.find( "copyright" ) != std::string::npos || + category_value == IP_CONTENT_REMOVAL || + category_value == IP_PERMISSONS_EXPLOIT) { gViewerWindow->alertXml("HelpReportAbuseContainsCopyright"); self->mCopyrightWarningSeen = TRUE; return; - }; - }; - }; + } + } + else if (category_value == IP_CONTENT_REMOVAL) + { + // IP_CONTENT_REMOVAL *always* shows the dialog - + // ergo you can never send that abuse report type. + gViewerWindow->alertXml("HelpReportAbuseContainsCopyright"); + return; + } + } LLUploadDialog::modalUploadDialog("Uploading...\n\nReport"); // *TODO don't upload image if checkbox isn't checked diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp index c540a0b37c..4705b2f5ba 100644 --- a/indra/newview/llfloaterwater.cpp +++ b/indra/newview/llfloaterwater.cpp @@ -185,7 +185,6 @@ void LLFloaterWater::onClickHelp(void* data) root_floater->addDependentFloater(dialogp); } } - delete xml_alert; } void LLFloaterWater::initHelpBtn(const std::string& name, const std::string& xml_alert) diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp index f03579a97b..4e27774029 100644 --- a/indra/newview/llfloaterwindlight.cpp +++ b/indra/newview/llfloaterwindlight.cpp @@ -243,7 +243,6 @@ void LLFloaterWindLight::onClickHelp(void* data) root_floater->addDependentFloater(dialogp); } } - delete xml_alert; } void LLFloaterWindLight::initHelpBtn(const std::string& name, const std::string& xml_alert) diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml index 9c55f505d2..d45d3e76f2 100644 --- a/indra/newview/skins/default/xui/fr/floater_gesture.xml +++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml @@ -5,10 +5,10 @@ et les sons. - + - +