From a8112de9df4cf80fadeed323a477fedd7581930b Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 21 Nov 2008 15:47:30 -0600 Subject: Likely fix for VWR-8920 (disappearing attachments). From http://svn.secondlife.com/trac/linden/changeset/1393 --- ChangeLog.txt | 7 +++++++ linden/indra/newview/lldrawable.cpp | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 15d5e13..9b3e11c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +2008-11-21 Jacek Antonelli + + * linden/indra/newview/lldrawable.cpp: + Likely fix for VWR-8920 (disappearing attachments). + From http://svn.secondlife.com/trac/linden/changeset/1393 + + 2008-11-18 Jacek Antonelli * linden/indra/llcrashlogger/llcrashlogger.cpp: diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp index 0f89585..5e4aafc 100644 --- a/linden/indra/newview/lldrawable.cpp +++ b/linden/indra/newview/lldrawable.cpp @@ -951,6 +951,9 @@ BOOL LLDrawable::isVisible() const return TRUE; } +#if 0 + //disabling this code fixes DEV-20105. Leaving in place in case some other bug pops up as a a result. + //should be safe to just always ask the spatial group for visibility. if (isActive()) { if (isRoot()) @@ -973,6 +976,7 @@ BOOL LLDrawable::isVisible() const } } else +#endif { LLSpatialGroup* group = getSpatialGroup(); if (group && group->isVisible()) -- cgit v1.1 From 265113e2c2a89826611ec61ba9ad37590d9a13bf Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 24 Nov 2008 18:11:26 -0600 Subject: Changed the grid selector options at login. Renamed "Agni" to "SL Main Grid", etc. and removed private LL grids from the list. Also added "Local OpenSim" option. --- ChangeLog.txt | 12 +++++ linden/indra/newview/llpanellogin.cpp | 64 +------------------------- linden/indra/newview/llviewernetwork.cpp | 78 ++++---------------------------- linden/indra/newview/llviewernetwork.h | 15 ------ 4 files changed, 23 insertions(+), 146 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 9b3e11c..8bee793 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,15 @@ +2008-11-24 Jacek Antonelli + + * linden/indra/newview/llpanellogin.cpp: + Changed the grid selector options at login. + Renamed "Agni" to "SL Main Grid", etc. and removed private + LL grids from the list. Also added "Local OpenSim" option. + * linden/indra/newview/llviewernetwork.cpp: + Ditto. + * linden/indra/newview/llviewernetwork.h: + Ditto. + + 2008-11-21 Jacek Antonelli * linden/indra/newview/lldrawable.cpp: diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 61bf215..86dab63 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp @@ -134,74 +134,14 @@ void LLLoginHandler::parse(const LLSD& queryMap) mLastName = queryMap["last_name"].asString(); EGridInfo grid_choice = GRID_INFO_NONE; - if (queryMap["grid"].asString() == "aditi") + if (queryMap["grid"].asString() == "sl beta grid") { grid_choice = GRID_INFO_ADITI; } - else if (queryMap["grid"].asString() == "agni") + else if (queryMap["grid"].asString() == "sl main grid") { grid_choice = GRID_INFO_AGNI; } - else if (queryMap["grid"].asString() == "siva") - { - grid_choice = GRID_INFO_SIVA; - } - else if (queryMap["grid"].asString() == "damballah") - { - grid_choice = GRID_INFO_DAMBALLAH; - } - else if (queryMap["grid"].asString() == "durga") - { - grid_choice = GRID_INFO_DURGA; - } - else if (queryMap["grid"].asString() == "shakti") - { - grid_choice = GRID_INFO_SHAKTI; - } - else if (queryMap["grid"].asString() == "soma") - { - grid_choice = GRID_INFO_SOMA; - } - else if (queryMap["grid"].asString() == "ganga") - { - grid_choice = GRID_INFO_GANGA; - } - else if (queryMap["grid"].asString() == "vaak") - { - grid_choice = GRID_INFO_VAAK; - } - else if (queryMap["grid"].asString() == "uma") - { - grid_choice = GRID_INFO_UMA; - } - else if (queryMap["grid"].asString() == "mohini") - { - grid_choice = GRID_INFO_MOHINI; - } - else if (queryMap["grid"].asString() == "yami") - { - grid_choice = GRID_INFO_YAMI; - } - else if (queryMap["grid"].asString() == "nandi") - { - grid_choice = GRID_INFO_NANDI; - } - else if (queryMap["grid"].asString() == "mitra") - { - grid_choice = GRID_INFO_MITRA; - } - else if (queryMap["grid"].asString() == "radha") - { - grid_choice = GRID_INFO_RADHA; - } - else if (queryMap["grid"].asString() == "ravi") - { - grid_choice = GRID_INFO_RAVI; - } - else if (queryMap["grid"].asString() == "aruna") - { - grid_choice = GRID_INFO_ARUNA; - } if(grid_choice != GRID_INFO_NONE) { diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index 13d432a..7d1d351 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp @@ -46,81 +46,21 @@ struct LLGridData static LLGridData gGridInfo[GRID_INFO_COUNT] = { { "None", "", "", ""}, - { "Aditi", - "util.aditi.lindenlab.com", + { "SL Beta Grid", + "util.aditi.lindenlab.com", "https://login.aditi.lindenlab.com/cgi-bin/login.cgi", "http://aditi-secondlife.webdev.lindenlab.com/helpers/" }, - { "Agni", + { "SL Main Grid", "util.agni.lindenlab.com", "https://login.agni.lindenlab.com/cgi-bin/login.cgi", "https://secondlife.com/helpers/" }, - { "Aruna", - "util.aruna.lindenlab.com", - "https://login.aruna.lindenlab.com/cgi-bin/login.cgi", - "http://aruna-secondlife.webdev.lindenlab.com/helpers/" }, - { "Damballah", - "util.damballah.lindenlab.com", - "https://login.damballah.lindenlab.com/cgi-bin/login.cgi", - "http://damballah-secondlife.webdev.lindenlab.com/helpers/" }, - { "Durga", - "util.durga.lindenlab.com", - "https://login.durga.lindenlab.com/cgi-bin/login.cgi", - "http://durga-secondlife.webdev.lindenlab.com/helpers/" }, - { "Ganga", - "util.ganga.lindenlab.com", - "https://login.ganga.lindenlab.com/cgi-bin/login.cgi", - "http://ganga-secondlife.webdev.lindenlab.com/helpers/" }, - { "Mitra", - "util.mitra.lindenlab.com", - "https://login.mitra.lindenlab.com/cgi-bin/login.cgi", - "http://mitra-secondlife.webdev.lindenlab.com/helpers/" }, - { "Mohini", - "util.mohini.lindenlab.com", - "https://login.mohini.lindenlab.com/cgi-bin/login.cgi", - "http://mohini-secondlife.webdev.lindenlab.com/helpers/" }, - { "Nandi", - "util.nandi.lindenlab.com", - "https://login.nandi.lindenlab.com/cgi-bin/login.cgi", - "http://nandi-secondlife.webdev.lindenlab.com/helpers/" }, - { "Radha", - "util.radha.lindenlab.com", - "https://login.radha.lindenlab.com/cgi-bin/login.cgi", - "http://radha-secondlife.webdev.lindenlab.com/helpers/" }, - { "Ravi", - "util.ravi.lindenlab.com", - "https://login.ravi.lindenlab.com/cgi-bin/login.cgi", - "http://ravi-secondlife.webdev.lindenlab.com/helpers/" }, - { "Siva", - "util.siva.lindenlab.com", - "https://login.siva.lindenlab.com/cgi-bin/login.cgi", - "http://siva-secondlife.webdev.lindenlab.com/helpers/" }, - { "Shakti", - "util.shakti.lindenlab.com", - "https://login.shakti.lindenlab.com/cgi-bin/login.cgi", - "http://shakti-secondlife.webdev.lindenlab.com/helpers/" }, - { "Soma", - "util.soma.lindenlab.com", - "https://login.soma.lindenlab.com/cgi-bin/login.cgi", - "http://soma-secondlife.webdev.lindenlab.com/helpers/" }, - { "Uma", - "util.uma.lindenlab.com", - "https://login.uma.lindenlab.com/cgi-bin/login.cgi", - "http://uma-secondlife.webdev.lindenlab.com/helpers/" }, - { "Vaak", - "util.vaak.lindenlab.com", - "https://login.vaak.lindenlab.com/cgi-bin/login.cgi", - "http://vaak-secondlife.webdev.lindenlab.com/helpers/" }, - { "Yami", - "util.yami.lindenlab.com", - "https://login.yami.lindenlab.com/cgi-bin/login.cgi", - "http://yami-secondlife.webdev.lindenlab.com/helpers/" }, - { "Local", - "localhost", - "https://login.dmz.lindenlab.com/cgi-bin/login.cgi", + { "Local OpenSim", + "localhost", + "http://0.0.0.0:9000", "" }, - { "Other", - "", - "https://login.dmz.lindenlab.com/cgi-bin/login.cgi", + { "Other", + "", + "", "" } }; diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h index 53bb0ab..e39507d 100644 --- a/linden/indra/newview/llviewernetwork.h +++ b/linden/indra/newview/llviewernetwork.h @@ -40,21 +40,6 @@ enum EGridInfo GRID_INFO_NONE, GRID_INFO_ADITI, GRID_INFO_AGNI, - GRID_INFO_ARUNA, - GRID_INFO_DAMBALLAH, - GRID_INFO_DURGA, - GRID_INFO_GANGA, - GRID_INFO_MITRA, - GRID_INFO_MOHINI, - GRID_INFO_NANDI, - GRID_INFO_RADHA, - GRID_INFO_RAVI, - GRID_INFO_SIVA, - GRID_INFO_SHAKTI, - GRID_INFO_SOMA, - GRID_INFO_UMA, - GRID_INFO_VAAK, - GRID_INFO_YAMI, GRID_INFO_LOCAL, GRID_INFO_OTHER, // IP address set via command line option GRID_INFO_COUNT -- cgit v1.1 From c07a4170324b61fc51e38ec72d44b26a52fc326e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 25 Nov 2008 18:18:52 -0600 Subject: Added "code name" field for grid selections. The code name is used to fetch the proper splash page. This decouples the user-visible label from the name expected by the SL web server. --- ChangeLog.txt | 13 +++++++++++++ linden/indra/newview/llpanellogin.cpp | 2 +- linden/indra/newview/llviewernetwork.cpp | 21 ++++++++++++++++----- linden/indra/newview/llviewernetwork.h | 14 ++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8bee793..193b965 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,16 @@ +2008-11-25 Jacek Antonelli + + * linden/indra/newview/llpanellogin.cpp: + Added "code name" field for grid selections. + The code name is used to fetch the proper splash page. + This decouples the user-visible label from the name + expected by the SL web server. + * linden/indra/newview/llviewernetwork.cpp: + Ditto. + * linden/indra/newview/llviewernetwork.h: + Ditto. + + 2008-11-24 Jacek Antonelli * linden/indra/newview/llpanellogin.cpp: diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 86dab63..1dff8e7 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp @@ -877,7 +877,7 @@ void LLPanelLogin::loadLoginPage() curl_free(curl_version); // Grid - char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0); + char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0); oStr << "&grid=" << curl_grid; curl_free(curl_grid); diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index 7d1d351..7fb19af 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp @@ -38,6 +38,7 @@ struct LLGridData { const char* mLabel; + const char* mCodeName; const char* mName; const char* mLoginURI; const char* mHelperURI; @@ -45,23 +46,23 @@ struct LLGridData static LLGridData gGridInfo[GRID_INFO_COUNT] = { - { "None", "", "", ""}, + { "None", "", "", "", "" }, { "SL Beta Grid", + "Aditi", "util.aditi.lindenlab.com", "https://login.aditi.lindenlab.com/cgi-bin/login.cgi", "http://aditi-secondlife.webdev.lindenlab.com/helpers/" }, { "SL Main Grid", + "Agni", "util.agni.lindenlab.com", "https://login.agni.lindenlab.com/cgi-bin/login.cgi", "https://secondlife.com/helpers/" }, { "Local OpenSim", + "", "localhost", "http://0.0.0.0:9000", "" }, - { "Other", - "", - "", - "" } + { "Other", "", "", "", "" } }; const EGridInfo DEFAULT_GRID_CHOICE = GRID_INFO_AGNI; @@ -160,6 +161,16 @@ std::string LLViewerLogin::getGridLabel() const return mGridName; } +std::string LLViewerLogin::getGridCodeName() const +{ + if( gGridInfo[mGridChoice].mCodeName == "" ) + { + return getGridLabel(); + } + + return gGridInfo[mGridChoice].mCodeName; +} + std::string LLViewerLogin::getKnownGridLabel(EGridInfo grid_index) const { if(grid_index > GRID_INFO_NONE && grid_index < GRID_INFO_OTHER) diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h index e39507d..39ac879 100644 --- a/linden/indra/newview/llviewernetwork.h +++ b/linden/indra/newview/llviewernetwork.h @@ -72,6 +72,20 @@ public: **/ std::string getGridLabel() const; + /** + * @brief Get the code name for the grid choice. + * + * Returns the code name for the grid choice, as designated + * by Linden Lab. The SL main grid is Agni, and the beta + * grid is Aditi. There are other LL testing grids with code + * names, but we don't care about those. + * + * This string is used primarily for fetching the proper + * login splash page, since the web server expects "Agni" + * and "Aditi", not "SL Main Grid" and "SL Beta Grid". + */ + std::string getGridCodeName() const; + std::string getKnownGridLabel(EGridInfo grid_index) const; void getLoginURIs(std::vector& uris) const; -- cgit v1.1 From 06352713b3b9de3a9040710577614df95f25457d Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Tue, 25 Nov 2008 18:58:24 -0600 Subject: Rearranged grid selectors so main grid is first. --- ChangeLog.txt | 8 ++++++++ linden/indra/newview/llstartup.cpp | 2 +- linden/indra/newview/llviewernetwork.cpp | 10 +++++----- linden/indra/newview/llviewernetwork.h | 2 +- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 193b965..dd99b55 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,13 @@ 2008-11-25 Jacek Antonelli + * linden/indra/newview/llstartup.cpp: + Rearranged grid selectors so main grid is first. + * linden/indra/newview/llviewernetwork.cpp: + Ditto. + * linden/indra/newview/llviewernetwork.cpp: + Ditto. + + * linden/indra/newview/llpanellogin.cpp: Added "code name" field for grid selections. The code name is used to fetch the proper splash page. diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index 0978fbb..625b1d8 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp @@ -2462,7 +2462,7 @@ void login_show() LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice()); LLViewerLogin* vl = LLViewerLogin::getInstance(); - for(int grid_index = GRID_INFO_ADITI; grid_index < GRID_INFO_OTHER; ++grid_index) + for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index) { LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index); } diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index 7fb19af..5b423ff 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp @@ -47,16 +47,16 @@ struct LLGridData static LLGridData gGridInfo[GRID_INFO_COUNT] = { { "None", "", "", "", "" }, - { "SL Beta Grid", - "Aditi", - "util.aditi.lindenlab.com", - "https://login.aditi.lindenlab.com/cgi-bin/login.cgi", - "http://aditi-secondlife.webdev.lindenlab.com/helpers/" }, { "SL Main Grid", "Agni", "util.agni.lindenlab.com", "https://login.agni.lindenlab.com/cgi-bin/login.cgi", "https://secondlife.com/helpers/" }, + { "SL Beta Grid", + "Aditi", + "util.aditi.lindenlab.com", + "https://login.aditi.lindenlab.com/cgi-bin/login.cgi", + "http://aditi-secondlife.webdev.lindenlab.com/helpers/" }, { "Local OpenSim", "", "localhost", diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h index 39ac879..970e2ce 100644 --- a/linden/indra/newview/llviewernetwork.h +++ b/linden/indra/newview/llviewernetwork.h @@ -38,8 +38,8 @@ class LLHost; enum EGridInfo { GRID_INFO_NONE, - GRID_INFO_ADITI, GRID_INFO_AGNI, + GRID_INFO_ADITI, GRID_INFO_LOCAL, GRID_INFO_OTHER, // IP address set via command line option GRID_INFO_COUNT -- cgit v1.1 From beb7e12d2af3106a405043ec9e25958bc950b191 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sat, 29 Nov 2008 01:10:51 -0700 Subject: Fixed search window not refreshing in RelWithDebInfo builds. --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llfloaterdirectory.cpp | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index dd99b55..f149120 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +2008-11-29 McCabe Maxsted + + * linden/indra/newview/llfloaterdirectory.cpp: + Fixed search window not refreshing in RelWithDebInfo builds. + + 2008-11-25 Jacek Antonelli * linden/indra/newview/llstartup.cpp: diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp index 305a029..9a0c2fc 100644 --- a/linden/indra/newview/llfloaterdirectory.cpp +++ b/linden/indra/newview/llfloaterdirectory.cpp @@ -383,10 +383,6 @@ void LLFloaterDirectory::showPanel(const std::string& tabname) // static void LLFloaterDirectory::toggleFind(void*) { -#ifndef LL_RELEASE_FOR_DOWNLOAD - delete sInstance; - sInstance = NULL; -#endif if (!sInstance) { std::string panel = gSavedSettings.getString("LastFindPanel"); -- cgit v1.1 From cbf968ee5957d3c31f3c732a56d2164e031aafba Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 29 Nov 2008 12:27:12 -0600 Subject: Stop console window from always showing up. --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llappviewer.cpp | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index f149120..ead1066 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,9 @@ +2008-11-29 Jacek Antonelli + + * linden/indra/newview/llappviewer.cpp: + Stop console window from always showing up. + + 2008-11-29 McCabe Maxsted * linden/indra/newview/llfloaterdirectory.cpp: diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 6301421..243a9d8 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -1604,11 +1604,6 @@ bool LLAppViewer::initConfiguration() gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME); -#ifndef LL_RELEASE_FOR_DOWNLOAD - gSavedSettings.setBOOL("ShowConsoleWindow", TRUE); - gSavedSettings.setBOOL("AllowMultipleViewers", TRUE); -#endif - #if !LL_DYNAMIC_FONT_DISCOVERY // static font discovery - user settings can override. gSavedSettings.setString("FontSansSerifFallback", -- cgit v1.1 From a6ac2f6f6d7a368700b02ece913aa213bb3e001c Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 19 Nov 2008 15:28:13 -0700 Subject: Fixed inworld browser crash in Windows. --- ChangeLog.txt | 6 ++++++ linden/install.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ead1066..7324410 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -50,6 +50,12 @@ From http://svn.secondlife.com/trac/linden/changeset/1393 +2008-11-19 McCabe Maxsted + + * linden/install.xml: + Fixed inworld browser crash in Windows. + + 2008-11-18 Jacek Antonelli * linden/indra/llcrashlogger/llcrashlogger.cpp: diff --git a/linden/install.xml b/linden/install.xml index 216c854..0326b24 100644 --- a/linden/install.xml +++ b/linden/install.xml @@ -699,9 +699,9 @@ anguage Infrstructure (CLI) international standard windows md5sum - 8c1b8881285631eb32ba541e10d07b07 + 42cb780c595d25881b4967292a4a0f40 url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080922.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080828.tar.bz2 -- cgit v1.1 From ab87675230ce6139f57b5f19af66599ada9e270e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 29 Nov 2008 21:19:57 -0600 Subject: Remove preprocessor condition for grid selector. The grid selector on the login screen will always show, instead of only showing when the viewer was compiled as LL_RELEASE_FOR_DOWNLOAD. --- ChangeLog.txt | 7 +++++++ linden/indra/newview/llpanellogin.cpp | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7324410..88829c9 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,12 @@ 2008-11-29 Jacek Antonelli + * linden/indra/newview/llpanellogin.cpp: + Remove preprocessor condition for grid selector. + The grid selector on the login screen will always show, + instead of only showing when the viewer was compiled + as LL_RELEASE_FOR_DOWNLOAD. + + * linden/indra/newview/llappviewer.cpp: Stop console window from always showing up. diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp index 1dff8e7..09e2cee 100644 --- a/linden/indra/newview/llpanellogin.cpp +++ b/linden/indra/newview/llpanellogin.cpp @@ -789,12 +789,7 @@ void LLPanelLogin::refreshLocation( bool force_visible ) sInstance->childSetVisible("start_location_combo", show_start); sInstance->childSetVisible("start_location_text", show_start); -#if LL_RELEASE_FOR_DOWNLOAD - BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid"); - sInstance->childSetVisible("server_combo", show_server); -#else sInstance->childSetVisible("server_combo", TRUE); -#endif #endif } -- cgit v1.1 From a97da2c607517551faef928353813b8456bfcc53 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 30 Nov 2008 13:33:02 -0600 Subject: Fixed passing nonliteral strings to *printf functions. gcc 4.3 rejects that as being unsafe. Patch by Stephen Zenith. [#11] --- ChangeLog.txt | 12 ++++++++++++ linden/indra/linux_crash_logger/llcrashloggerlinux.cpp | 2 +- linden/indra/llwindow/llwindowsdl.cpp | 2 +- linden/indra/lscript/lscript_compile/lscript_tree.cpp | 8 ++++---- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 88829c9..2e4f19b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,15 @@ +2008-11-30 Jacek Antonelli + + * linden/indra/llwindow/llwindowsdl.cpp: + Fixed passing nonliteral strings to *printf functions. + gcc 4.3 rejects that as being unsafe. + Patch by Stephen Zenith. [#11] + * linden/indra/linux_crash_logger/llcrashloggerlinux.cpp: + Ditto. + * linden/indra/lscript/lscript_compile/lscript_tree.cpp: + Ditto. + + 2008-11-29 Jacek Antonelli * linden/indra/newview/llpanellogin.cpp: diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp index 6ac9831..c4294d6 100644 --- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp @@ -90,7 +90,7 @@ static BOOL do_ask_dialog(void) win = gtk_message_dialog_new(NULL, flags, messagetype, buttons, - dialog_text); + "%s", dialog_text); gtk_window_set_type_hint(GTK_WINDOW(win), GDK_WINDOW_TYPE_HINT_DIALOG); gtk_window_set_title(GTK_WINDOW(win), dialog_title); diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index c088dd8..f0acee5 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp @@ -2530,7 +2530,7 @@ S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 typ buttons = GTK_BUTTONS_YES_NO; break; } - win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, text.c_str()); + win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, "%s", text.c_str()); # if LL_X11 // Make GTK tell the window manager to associate this diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp index 71e7f19..70d8195 100644 --- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp +++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp @@ -7885,10 +7885,10 @@ void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom { // Prefix function name with g to distinguish from // event handlers. - fprintf(fp, gScriptp->getClassName()); + fprintf(fp, "%s", gScriptp->getClassName()); fprintf(fp, "::'g"); } - fprintf(fp, mIdentifier->mName); + fprintf(fp, "%s", mIdentifier->mName); fprintf(fp, "'("); print_cil_arg_list(fp, mIdentifier->mScopeEntry->mFunctionArgs); fprintf(fp, ")\n"); @@ -9720,7 +9720,7 @@ void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom // Allows state changing by finding handlers prefixed with new // state name. Prefix disambiguates functions and event handlers. fprintf(fp, "e"); - fprintf(fp, entry->mIdentifier); + fprintf(fp, "%s", entry->mIdentifier); // Handler name and arguments. mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL); @@ -10152,7 +10152,7 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT fprintf(fp, ".method public hidebysig instance default "); print_cil_type(fp, mType ? mType->mType : LST_NULL); fprintf(fp, " 'g"); - fprintf(fp, mIdentifier->mName); + fprintf(fp, "%s", mIdentifier->mName); fprintf(fp, "'"); if (mParameters) { -- cgit v1.1 From aff35cae3d5c3f0f4a2798498464914f3a922a91 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sun, 30 Nov 2008 13:39:21 -0600 Subject: Disable llmozlib-dependent code when not available. Patch by Stephen Zenith. [#12] --- ChangeLog.txt | 5 +++++ linden/indra/llmedia/llmediamanager.cpp | 2 ++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 2e4f19b..6c7008c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2008-11-30 Jacek Antonelli + * linden/indra/llmedia/llmediamanager.cpp: + Disable llmozlib-dependent code when not available. + Patch by Stephen Zenith. [#12] + + * linden/indra/llwindow/llwindowsdl.cpp: Fixed passing nonliteral strings to *printf functions. gcc 4.3 rejects that as being unsafe. diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp index f72e63c..16c731f 100644 --- a/linden/indra/llmedia/llmediamanager.cpp +++ b/linden/indra/llmedia/llmediamanager.cpp @@ -150,8 +150,10 @@ LLMediaManager* LLMediaManager::getInstance() // (static) void LLMediaManager::setBrowserUserAgent(std::string user_agent) { +#if LL_LLMOZLIB_ENABLED // *HACK: Breaks encapsulation model, as initClass does above. JC LLMediaImplLLMozLib::setBrowserUserAgent(user_agent); +#endif } //////////////////////////////////////////////////////////////////////////////// -- cgit v1.1 From 47f7a7ca951ea888be7da23d874641523a1e67c8 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 4 Dec 2008 02:02:18 -0600 Subject: Imprudence 1.0.0 RC2 released. --- ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 6c7008c..ee1067a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +2008-12-04 Jacek Antonelli + + * Imprudence 1.0.0 RC2 released. + + 2008-11-30 Jacek Antonelli * linden/indra/llmedia/llmediamanager.cpp: -- cgit v1.1 From b01f7b6bf6ac26f040177f845477936aa0697b2d Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 4 Dec 2008 15:30:43 -0600 Subject: Use 127.0.0.1 for local opensim, not 0.0.0.0. --- ChangeLog.txt | 4 ++++ linden/indra/newview/llviewernetwork.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ee1067a..29859e1 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -3,6 +3,10 @@ * Imprudence 1.0.0 RC2 released. + * linden/indra/newview/llviewernetwork.cpp: + Use 127.0.0.1 for local opensim, not 0.0.0.0. + + 2008-11-30 Jacek Antonelli * linden/indra/llmedia/llmediamanager.cpp: diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp index 5b423ff..c8cffcf 100644 --- a/linden/indra/newview/llviewernetwork.cpp +++ b/linden/indra/newview/llviewernetwork.cpp @@ -60,7 +60,7 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] = { "Local OpenSim", "", "localhost", - "http://0.0.0.0:9000", + "http://127.0.0.1:9000", "" }, { "Other", "", "", "", "" } }; -- cgit v1.1 From 636460bd7a18c1b621b096ad55a80a5b49320775 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 6 Dec 2008 11:47:18 -0600 Subject: VWR-10759 (use delete [] in LLMediaImplGStreamer) Patch by Aleric Inglewood. --- ChangeLog.txt | 7 +++++++ linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 29859e1..7ca5d3b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +2008-12-06 Jacek Antonelli + + * linden/indra/llmedia/llmediaimplgstreamer.cpp: + VWR-10759 (use delete [] in LLMediaImplGStreamer) + Patch by Aleric Inglewood. + + 2008-12-04 Jacek Antonelli * Imprudence 1.0.0 RC2 released. diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index 51a5bca..5d6a648 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -428,7 +428,7 @@ unload () if (mediaData) { - delete mediaData; + delete [] mediaData; mediaData = NULL; } -- cgit v1.1 From 16ec76454eba3143e98434adab731cc71ad5ee0b Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 6 Dec 2008 11:50:22 -0600 Subject: VWR-10837 (use delete [] in LLImageTGA) Patch by Aleric Inglewood. --- ChangeLog.txt | 5 +++++ linden/indra/llimage/llimagetga.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 7ca5d3b..533bddd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2008-12-06 Jacek Antonelli + * linden/indra/llimage/llimagetga.cpp: + VWR-10837 (use delete [] in LLImageTGA) + Patch by Aleric Inglewood. + + * linden/indra/llmedia/llmediaimplgstreamer.cpp: VWR-10759 (use delete [] in LLMediaImplGStreamer) Patch by Aleric Inglewood. diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp index 32c2111..21d0fd1 100644 --- a/linden/indra/llimage/llimagetga.cpp +++ b/linden/indra/llimage/llimagetga.cpp @@ -104,7 +104,7 @@ LLImageTGA::LLImageTGA(const std::string& file_name) LLImageTGA::~LLImageTGA() { - delete mColorMap; + delete [] mColorMap; } BOOL LLImageTGA::updateData() -- cgit v1.1 From 6718a49a75c861336d272082b1af46b5910f89ad Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 6 Dec 2008 11:53:58 -0600 Subject: VWR-9400 (memleak whenever an LSL script is uploaded) Patch by Carjay McGinnis. --- ChangeLog.txt | 5 +++++ linden/indra/llmessage/llhttpclient.cpp | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 533bddd..f9baad6 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2008-12-06 Jacek Antonelli + * linden/indra/llmessage/llhttpclient.cpp: + VWR-9400 (memleak whenever an LSL script is uploaded) + Patch by Carjay McGinnis. + + * linden/indra/llimage/llimagetga.cpp: VWR-10837 (use delete [] in LLImageTGA) Patch by Aleric Inglewood. diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp index fc2612f..6242bda 100644 --- a/linden/indra/llmessage/llhttpclient.cpp +++ b/linden/indra/llmessage/llhttpclient.cpp @@ -160,10 +160,9 @@ namespace fstream.seekg(0, std::ios::end); U32 fileSize = fstream.tellg(); fstream.seekg(0, std::ios::beg); - char* fileBuffer; - fileBuffer = new char [fileSize]; - fstream.read(fileBuffer, fileSize); - ostream.write(fileBuffer, fileSize); + std::vector fileBuffer(fileSize); + fstream.read(&fileBuffer[0], fileSize); + ostream.write(&fileBuffer[0], fileSize); fstream.close(); eos = true; return STATUS_DONE; -- cgit v1.1 From 20c9dc0a1da2cd57716796ae97adcd4d018213da Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 6 Dec 2008 12:00:05 -0600 Subject: VWR-9400-patch2 (memleak whenever an LSL script is uploaded) Patch by Henri Beauchamp. --- ChangeLog.txt | 5 +++++ linden/indra/llmessage/llhttpclient.cpp | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index f9baad6..d6a7ee1 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,11 @@ 2008-12-06 Jacek Antonelli * linden/indra/llmessage/llhttpclient.cpp: + VWR-9400b (memleak whenever an LSL script is uploaded) + Patch by Henri Beauchamp. + + + * linden/indra/llmessage/llhttpclient.cpp: VWR-9400 (memleak whenever an LSL script is uploaded) Patch by Carjay McGinnis. diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp index 6242bda..ef163fa 100644 --- a/linden/indra/llmessage/llhttpclient.cpp +++ b/linden/indra/llmessage/llhttpclient.cpp @@ -189,10 +189,9 @@ namespace LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ); S32 fileSize = vfile.getSize(); - U8* fileBuffer; - fileBuffer = new U8 [fileSize]; - vfile.read(fileBuffer, fileSize); - ostream.write((char*)fileBuffer, fileSize); + std::vector fileBuffer(fileSize); + vfile.read(&fileBuffer[0], fileSize); + ostream.write((char*)&fileBuffer[0], fileSize); eos = true; return STATUS_DONE; } -- cgit v1.1 From 925975639a2438bc9bdf43a0ceaab1c4555052b0 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 6 Dec 2008 20:47:39 -0600 Subject: Added banners in ChangeLog to set versions apart. Entries should be placed in the section for the version into which they were merged. Entries within a section should be sorted chronologically. This is important for keeping track of changes which weren't merged until a later release than they were written. (Mixing them in chronologically would cause confusion about which changes were included in a release.) --- ChangeLog.txt | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index d6a7ee1..148f6fb 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,19 @@ 2008-12-06 Jacek Antonelli + * ChangeLog: + Added banners in ChangeLog to set versions apart. + + Entries should be placed in the section for the + version into which they were merged. Entries within + a section should be sorted chronologically. + + This is important for keeping track of changes which + weren't merged until a later release than they were + written. (Mixing them in chronologically would cause + confusion about which changes were included in a + release.) + + * linden/indra/llmessage/llhttpclient.cpp: VWR-9400b (memleak whenever an LSL script is uploaded) Patch by Henri Beauchamp. @@ -20,6 +34,11 @@ Patch by Aleric Inglewood. +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +=- 1.0.0 RC2 -= +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + + 2008-12-04 Jacek Antonelli * Imprudence 1.0.0 RC2 released. @@ -156,6 +175,11 @@ and position. It will now correctly inherit from default skin. +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +=- 1.0.0 RC1 -= +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + + 2008-11-15 Jacek Antonelli * Imprudence 1.0.0 RC1 released. -- cgit v1.1