diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index a06eed0647..afd1b664a2 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -35,6 +35,14 @@ else (OPENSIM) endif (OPENSIM) # +# Support for test builds +option(TESTBUILD "Generating test build" OFF) +if(TESTBUILD AND TESTBUILDPERIOD) + add_definitions(-DTESTBUILD=1 -DTESTBUILDPERIOD=${TESTBUILDPERIOD}) + message("creating test build version; test period: ${TESTBUILDPERIOD} days") +endif(TESTBUILD AND TESTBUILDPERIOD) +# + # [AVX Optimization] option(USE_AVX_OPTIMIZATION "AVX optimization support" OFF) option(USE_AVX2_OPTIMIZATION "AVX2 optimization support" OFF) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 37acb10661..0923dd5c76 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1918,7 +1918,6 @@ set(viewer_APPSETTINGS_FILES app_settings/autoreplace.xml app_settings/client_list_v2.xml app_settings/cloud.xml - app_settings/cloud_muted.xml app_settings/cmd_line.xml app_settings/commands.xml app_settings/foldertypes.xml diff --git a/indra/newview/app_settings/cloud_muted.xml b/indra/newview/app_settings/cloud_muted.xml deleted file mode 100644 index 765c7239c6..0000000000 --- a/indra/newview/app_settings/cloud_muted.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - SourceMaxAge - 0 - SourceStartAge - 0 - - AngularVelocity - - 0 - 0 - 0 - - InnerAngle - 3.1415927410125732421875 - OuterAngle - 0 - - BurstPartCount - 1 - BurstRadius - 0.3 - BurstRate - 0.02 - BurstSpeedMin - 0.1 - BurstSpeedMax - 1 - - - LL_PART_SRC_PATTERN_ANGLE - 0 - LL_PART_SRC_PATTERN_ANGLE_CONE - 1 - LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY - 0 - LL_PART_SRC_PATTERN_DROP - 0 - LL_PART_SRC_PATTERN_EXPLODE - 1 - - - - - ParticleMaxAge - 4 - - PartImageID - 0000000000000-0000-0000-000000000000 - - StartColor - - 0.13 - 0.78 - 0.13 - 0.3 - - EndColor - - 0.13 - 0.39 - 0.13 - 0.1 - - - StartScale - - 0.8 - 0.8 - - EndScale - - 0.01 - 0.01 - - - TargetId - 00000000-0000-0000-0000-000000000000 - - - LL_PART_BEAM_MASK - 0 - LL_PART_BOUNCE_MASK - 0 - LL_PART_EMISSIVE_MASK - 1 - LL_PART_FOLLOW_SRC_MASK - 0 - LL_PART_FOLLOW_VELOCITY_MASK - 0 - LL_PART_INTERP_COLOR_MASK - 1 - LL_PART_INTERP_SCALE_MASK - 1 - LL_PART_TARGET_LINEAR_MASK - 0 - LL_PART_TARGET_POS_MASK - 1 - LL_PART_WIND_MASK - 1 - - - - diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index a9c3e8fd58..bfb2521ea0 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -177,18 +177,6 @@ Value - - ShowMutedAvatarsAsCloud - - Comment - If true, show muted avatars as clouds. - Persist - 1 - Type - Boolean - Value - 1 - FSShowDummyAVsinRadar Comment diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index b423f36eb8..559acd43a5 100644 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -676,13 +676,18 @@ bool LLEnvManagerNew::useRegionSky() return true; } - // *TODO: Support fixed sky from region. - + // Otherwise apply region day cycle/skies. // Quickprefs integration FloaterQuickPrefs::updateParam(QP_PARAM_SKY, PRESET_NAME_REGION_DEFAULT); - // Otherwise apply region day cycle. LL_DEBUGS("Windlight") << "Applying region sky" << LL_ENDL; + + // *TODO: Support fixed sky from region. Just do sky reset for now. + if (region_settings.getSkyMap().size() == 1) + { + // Region is set to fixed sky. Reset. + useSkyParams(region_settings.getSkyMap().beginMap()->second); + } return useDayCycleParams( region_settings.getWLDayCycle(), LLEnvKey::SCOPE_REGION, diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 25560d73ef..3e1fb4ab32 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -486,9 +486,52 @@ void downloadGridlistError( LLSD const &aData, std::string const &aURL ) LL_WARNS("SLGridStatusResponder") << "Error - output without " << LL_ENDL; } } - // +// Check for test build expiration +bool is_testbuild_expired() +{ +#if TESTBUILD + std::string datestr = __DATE__; + + std::istringstream iss_date(datestr); + std::string str_month; + S32 day; + S32 year; + S32 month = 1; + iss_date >> str_month >> day >> year; + + if (str_month == "Jan") month = 1; + else if (str_month == "Feb") month = 2; + else if (str_month == "Mar") month = 3; + else if (str_month == "Apr") month = 4; + else if (str_month == "May") month = 5; + else if (str_month == "Jun") month = 6; + else if (str_month == "Jul") month = 7; + else if (str_month == "Aug") month = 8; + else if (str_month == "Sep") month = 9; + else if (str_month == "Oct") month = 10; + else if (str_month == "Nov") month = 11; + else if (str_month == "Dec") month = 12; + + tm t = {0}; + t.tm_mon = month - 1; + t.tm_mday = day; + t.tm_year = year - 1900; + t.tm_hour = 0; + t.tm_min = 0; + t.tm_sec = 0; + + time_t expiry_time = mktime(&t) + (S32(TESTBUILDPERIOD) + 1) * 24 * 60 * 60; + time_t current_time = time(NULL); + + return current_time > expiry_time; +#else + return false; +#endif +} +// + void update_texture_fetch() { LLAppViewer::getTextureCache()->update(1); // unpauses the texture cache thread @@ -1163,6 +1206,17 @@ bool idle_startup() if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState()) { + // Check for test build expiration + if (is_testbuild_expired()) + { + LL_INFOS() << "This test version has expired and cannot be used any further." << LL_ENDL; + LLNotificationsUtil::add("TestversionExpired", LLSD(), LLSD(), login_alert_done); + LLStartUp::setStartupState(STATE_LOGIN_CONFIRM_NOTIFICATON); + show_connect_box = true; + return FALSE; + } + // + // Login block LLSD blocked = FSData::instance().allowedLogin(); if (blocked.isMap()) //hack for testing for an empty LLSD diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 527d7d7a9c..747badddf1 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -637,7 +637,6 @@ LLVOAvatar::LLVOAvatar(const LLUUID& id, mTyping(FALSE), mMeshValid(FALSE), mVisible(FALSE), - mMutedAsCloud(false), // Show muted avatars as cloud mWindFreq(0.f), mRipplePhase( 0.f ), mBelowWater(FALSE), @@ -1134,7 +1133,6 @@ void LLVOAvatar::cleanupClass() } LLPartSysData LLVOAvatar::sCloud; -LLPartSysData LLVOAvatar::sCloudMuted; void LLVOAvatar::initCloud() { // fancy particle cloud designed by Brent @@ -1172,11 +1170,6 @@ void LLVOAvatar::initCloud() // llifstream in_file_muted(filename); llifstream in_file_muted(filename.c_str()); // - - LLSDSerialize::fromXMLDocument(cloud_muted, in_file_muted); - sCloudMuted.fromLLSD(cloud_muted); - LLViewerTexture* cloud_muted_texture = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.j2c"); - sCloudMuted.mPartImageID = cloud_muted_texture->getID(); } void LLVOAvatar::initInstance(void) @@ -2439,11 +2432,6 @@ void LLVOAvatar::idleUpdate(LLAgent &agent, const F64 &time) // attach objects that were waiting for a drawable lazyAttach(); - // Show muted avatars as cloud - static LLUICachedControl showMutedAvatarsAsCloud("ShowMutedAvatarsAsCloud", false); - mMutedAsCloud = !isSelf() && showMutedAvatarsAsCloud && isInMuteList(); - // - // animate the character // store off last frame's root position to be consistent with camera position mLastRootPos = mRoot->getWorldPosition(); @@ -2905,14 +2893,7 @@ void LLVOAvatar::idleUpdateLoadingEffect() // Firestorm Clouds if (!isTooComplex()) // do not generate particles for overly-complex avatars { - if (mMutedAsCloud) - { - setParticleSource(sCloudMuted, getID()); - } - else - { - setParticleSource(sCloud, getID()); - } + setParticleSource(sCloud, getID()); } } // @@ -7595,9 +7576,6 @@ bool LLVOAvatar::getIsCloud() const || !isTextureDefined(TEX_UPPER_BAKED) || !isTextureDefined(TEX_HEAD_BAKED) ) - // Show muted avatars as cloud - || mMutedAsCloud - // ); } @@ -7622,10 +7600,7 @@ void LLVOAvatar::updateRezzedStatusTimers() startPhase("first_load_" + LLVOAvatar::rezStatusToString(i)); } } - // Show muted avatars as cloud - //if (rez_status < mLastRezzedStatus) - if (rez_status < mLastRezzedStatus && !mMutedAsCloud) - // + if (rez_status < mLastRezzedStatus) { // load level has decreased. start phase timers for higher load levels. for (S32 i = rez_status+1; i <= mLastRezzedStatus; i++) @@ -7791,10 +7766,7 @@ BOOL LLVOAvatar::updateIsFullyLoaded() void LLVOAvatar::updateRuthTimer(bool loading) { - // Show muted avatars as cloud - //if (isSelf() || !loading) - if (isSelf() || !loading || !mMutedAsCloud) - // + if (isSelf() || !loading) { return; } @@ -7862,8 +7834,7 @@ BOOL LLVOAvatar::isFullyLoaded() const // return (mRenderUnloadedAvatar || mFullyLoaded); // [SL:KB] - Patch: Appearance-SyncAttach | Checked: 2010-09-22 (Catznip-2.2) // Changes to LLAppearanceMgr::updateAppearanceFromCOF() expect this function to actually return mFullyLoaded for gAgentAvatarp - //return (mRenderUnloadedAvatar && !isSelf()) ||(mFullyLoaded); - return (mRenderUnloadedAvatar && !isSelf() && !mMutedAsCloud) ||(mFullyLoaded); // Particle clouds! + return (mRenderUnloadedAvatar && !isSelf()) ||(mFullyLoaded); // [/SL:KB] } diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index 9d8360eb99..e5405fb6ea 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -241,9 +241,6 @@ public: private: //aligned members LL_ALIGN_16(LLVector4a mImpostorExtents[2]); - // Show muted avatars as cloud - bool mMutedAsCloud; - //-------------------------------------------------------------------- // Updates //-------------------------------------------------------------------- @@ -315,7 +312,6 @@ public: static BOOL sJointDebug; // output total number of joints being touched for each avatar static BOOL sDebugAvatarRotation; static LLPartSysData sCloud; - static LLPartSysData sCloudMuted; //-------------------------------------------------------------------- // Region state diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 923f5e28af..c8f3f052fb 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -4742,6 +4742,12 @@ Dieses wird die folgenden Informationen an die aktuelle IM-Sitzung senden: name="okbutton" yestext="OK"/> + + Diese Testversion von [APP_NAME] is abgelaufen und kann nicht weiter verwendet werden. + + [NAME] hat die eine Anfrage geschickt, Informationen über Ihre [APP_NAME]-Konfiguration zu übermitteln. diff --git a/indra/newview/skins/default/xui/de/panel_preferences_move.xml b/indra/newview/skins/default/xui/de/panel_preferences_move.xml index fae529d242..1213cb064b 100644 --- a/indra/newview/skins/default/xui/de/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/de/panel_preferences_move.xml @@ -25,7 +25,6 @@ (Erfordert Neustart) - diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index bad60ea3e6..74b1695f77 100644 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -140,7 +140,7 @@ The Firestorm Development Team: top_pad="4" width="420" wrap="true"> -Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Cinder Roxley, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, Selo Jacobus, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic and Zi Ree. +Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Beq Janus, Cinder Roxley, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, Selo Jacobus, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic and Zi Ree. + + This test version of [APP_NAME] has expired and cannot be used any further. + + + - - diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml index d137828b1d..887fc7662c 100644 --- a/indra/newview/skins/default/xui/fr/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/fr/panel_preferences_move.xml @@ -20,7 +20,6 @@ (Redémarrage requis) - diff --git a/indra/newview/skins/default/xui/it/panel_preferences_move.xml b/indra/newview/skins/default/xui/it/panel_preferences_move.xml index 74d192ad67..7585b92438 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_move.xml @@ -22,7 +22,6 @@ (Richiesto riavvio) - diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml index d75e56d951..2d06b2db18 100644 --- a/indra/newview/skins/default/xui/ja/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/ja/panel_preferences_move.xml @@ -28,7 +28,6 @@ （再起動が必要） - diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml index 989f654825..5b6ce33bbf 100644 --- a/indra/newview/skins/default/xui/pl/floater_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_tools.xml @@ -77,8 +77,8 @@ -