From 4270407eca97bc2275f920a6452d6d5490875779 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 17 Oct 2008 15:56:48 -0500 Subject: Second Life viewer sources 1.21.6 --- linden/indra/llcommon/llversionviewer.h | 2 +- linden/indra/llui/llscrolllistctrl.cpp | 3 +- linden/indra/newview/lleventpoll.cpp | 7 ++- linden/indra/newview/llfloaterdaycycle.cpp | 1 - linden/indra/newview/llfloaterregioninfo.cpp | 1 - linden/indra/newview/llfloaterreporter.cpp | 23 +++++++-- linden/indra/newview/llfloaterwater.cpp | 1 - linden/indra/newview/llfloaterwindlight.cpp | 1 - linden/indra/newview/llpaneldirland.cpp | 2 - .../newview/skins/default/xui/en-us/alerts.xml | 6 +-- .../default/xui/en-us/floater_report_abuse.xml | 12 ++--- .../skins/default/xui/fr/floater_gesture.xml | 4 +- .../default/xui/fr/floater_preview_gesture.xml | 2 +- .../indra/newview/skins/default/xui/fr/notify.xml | 55 ++++++++++++++-------- .../newview/skins/default/xui/fr/panel_avatar.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 +-- .../skins/default/xui/fr/panel_preferences_im.xml | 2 +- .../default/xui/fr/panel_preferences_input.xml | 2 +- .../indra/newview/skins/default/xui/fr/strings.xml | 4 +- 22 files changed, 90 insertions(+), 59 deletions(-) diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 739a30a..66462b3 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/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 = 0; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp index e2623fb..d342378 100644 --- a/linden/indra/llui/llscrolllistctrl.cpp +++ b/linden/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/linden/indra/newview/lleventpoll.cpp b/linden/indra/newview/lleventpoll.cpp index 083c46c..6b95102 100644 --- a/linden/indra/newview/lleventpoll.cpp +++ b/linden/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/linden/indra/newview/llfloaterdaycycle.cpp b/linden/indra/newview/llfloaterdaycycle.cpp index c0f8a48..6a6a430 100644 --- a/linden/indra/newview/llfloaterdaycycle.cpp +++ b/linden/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/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp index 78d07cf..8a4f621 100644 --- a/linden/indra/newview/llfloaterregioninfo.cpp +++ b/linden/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/linden/indra/newview/llfloaterreporter.cpp b/linden/indra/newview/llfloaterreporter.cpp index 78f5623..e8643c0 100644 --- a/linden/indra/newview/llfloaterreporter.cpp +++ b/linden/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/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp index 371f17a..025562a 100644 --- a/linden/indra/newview/llfloaterwater.cpp +++ b/linden/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/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp index 8ed95da..f0d5480 100644 --- a/linden/indra/newview/llfloaterwindlight.cpp +++ b/linden/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/linden/indra/newview/llpaneldirland.cpp b/linden/indra/newview/llpaneldirland.cpp index c67ee9e..6e8af5f 100644 --- a/linden/indra/newview/llpaneldirland.cpp +++ b/linden/indra/newview/llpaneldirland.cpp @@ -100,8 +100,6 @@ BOOL LLPanelDirLand::postBuild() if (results) { results->setSortChangedCallback(onClickSort); - // primary sort key is mCurrentSortColumn, secondary is name - results->sortByColumn("name", TRUE); results->sortByColumn(mCurrentSortColumn,mCurrentSortAscending); } diff --git a/linden/indra/newview/skins/default/xui/en-us/alerts.xml b/linden/indra/newview/skins/default/xui/en-us/alerts.xml index f412f52..20b04db 100644 --- a/linden/indra/newview/skins/default/xui/en-us/alerts.xml +++ b/linden/indra/newview/skins/default/xui/en-us/alerts.xml @@ -4360,13 +4360,13 @@ Entering an accurate description helps us file and process bug reports. Dear Resident, -If you are reporting intellectual property infringement, please make sure you are reporting it correctly: +You appear to be reporting intellectual property infringement. Please make sure you are reporting it correctly: (1) The Abuse Process. You may submit an abuse report if you believe a Resident is exploiting the Second Life permissions system, for example, by using CopyBot or similar copying tools, to infringe intellectual property rights. The Abuse Team investigates and issues appropriate disciplinary action for behavior that violates the Second Life Community Standards or Terms of Service. However, the Abuse Team does not handle and will not respond to requests to remove content from the Second Life world. -(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you must submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php. +(2) The DMCA or Content Removal Process. To request removal of content from Second Life, you MUST submit a valid notification of infringement as provided in our DMCA Policy at http://secondlife.com/corporate/dmca.php. -If you still wish to continue with the abuse process, please close this window and finish submitting your report. +If you still wish to continue with the abuse process, please close this window and finish submitting your report. You may need to select the specific category 'CopyBot or Permissions Exploit'. Thank you, diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml index 00ee9ac..1c4b359 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_report_abuse.xml @@ -96,12 +96,10 @@ Assault > Combat sandbox / unsafe area Assault > Safe area Assault > Weapons testing sandbox - -Copyright or intellectual property violation Commerce > Failure to deliver product or service - -Disclosure > First life information + +Disclosure > Real world information Disclosure > Remotely monitoring chat @@ -144,6 +142,10 @@ Indecency > Broadly visible mature content Indecency > Inappropriate avatar name Indecency > Mature content in PG region + +Intellectual property infringement > Content Removal + +Intellectual property infringement > CopyBot or Permissions Exploit Intolerance @@ -154,8 +156,6 @@ Land > Encroachment > Objects/textures Land > Encroachment > Particles Land > Encroachment > Trees/plants - -Trademark violation Wagering/gambling diff --git a/linden/indra/newview/skins/default/xui/fr/floater_gesture.xml b/linden/indra/newview/skins/default/xui/fr/floater_gesture.xml index 9c55f50..d45d3e7 100644 --- a/linden/indra/newview/skins/default/xui/fr/floater_gesture.xml +++ b/linden/indra/newview/skins/default/xui/fr/floater_gesture.xml @@ -5,10 +5,10 @@ et les sons. - + - +