From b3610dd836340a31bd1f5e033047f1d6ee9aa056 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 18 Nov 2009 22:43:47 -0600 Subject: Renamed menu items: "Import Object..." and "Import + Upload..." --- ChangeLog.txt | 5 +++++ linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ce7eb67..c375dab 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2009-11-18 Jacek Antonelli + * Renamed menu items: "Import Object..." and "Import + Upload..." + + modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml + + * Fixed a compile blocker in LLVoSky::stepCurrent(). modified: linden/indra/newview/llvosky.h diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 1b36bca..b53cbf3 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -29,11 +29,12 @@ - + - -- cgit v1.1 From 07354173bfa3d536d4f493cec7dfe06a68fc95cc Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 18 Nov 2009 22:56:09 -0600 Subject: Added "(L$[COST] per texture)" to "Import + Upload..." --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llviewermenu.cpp | 1 + linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index c375dab..8050f24 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,11 @@ 2009-11-18 Jacek Antonelli + * Added "(L$[COST] per texture)" to "Import + Upload..." + + modified: linden/indra/newview/llviewermenu.cpp + modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml + + * Renamed menu items: "Import Object..." and "Import + Upload..." modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index ecf6fcb..895f488 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -676,6 +676,7 @@ void init_menus() gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost); gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost); gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost); + gMenuHolder->childSetLabelArg("ImportUpload", "[COST]", upload_cost); gAFKMenu = gMenuBarView->getChild("Set Away", TRUE); gBusyMenu = gMenuBarView->getChild("Set Busy", TRUE); diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index b53cbf3..7d36195 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -34,7 +34,7 @@ -- cgit v1.1 From 3a61d201ec8a3c0e2e691708ac20228270b9a1c8 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 18 Nov 2009 23:03:25 -0600 Subject: Added "File > Export Selected Objects..." --- ChangeLog.txt | 5 +++++ linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8050f24..492d353 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,10 @@ 2009-11-18 Jacek Antonelli + * Added "File > Export Selected Objects..." + + modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml + + * Added "(L$[COST] per texture)" to "Import + Upload..." modified: linden/indra/newview/llviewermenu.cpp diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 7d36195..078fb56 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -39,6 +39,11 @@ + + + + + * SNOW-108: Fast timers fail on non i386 systems + Patch by Robin Cornelius + + modified: doc/contributions.txt + modified: indra/llcommon/llfasttimer.cpp + modified: indra/llcommon/llfasttimer.h + + * Added "File > Export Selected Objects..." modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 64304dc..e99bd78 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt @@ -347,6 +347,7 @@ princess niven Renault Clio VWR-1976 Robin Cornelius + SNOW-108 VWR-2488 Ryozu Kojima VWR-287 diff --git a/linden/indra/llcommon/llfasttimer.cpp b/linden/indra/llcommon/llfasttimer.cpp index 3304528..9253f2b 100644 --- a/linden/indra/llcommon/llfasttimer.cpp +++ b/linden/indra/llcommon/llfasttimer.cpp @@ -63,6 +63,12 @@ int LLFastTimer::sResetHistory = 0; F64 LLFastTimer::sCPUClockFrequency = 0.0; +#if LL_LINUX || LL_SOLARIS +U64 LLFastTimer::sClockResolution = 1e9; // Nanosecond resolution +#else +U64 LLFastTimer::sClockResolution = 1e6; // Microsecond resolution +#endif + ////////////////////////////////////////////////////////////////////////////// // @@ -90,17 +96,26 @@ U64 get_cpu_clock_count() #endif // LL_WINDOWS - -#if (LL_LINUX || LL_SOLARIS) && (defined(__i386__) || defined(__amd64__)) +#if LL_LINUX || LL_SOLARIS +// Try to use the MONOTONIC clock if available, this is a constant time counter +// with nanosecond resolution (but not necessarily accuracy) and attempts are made +// to synchronize this value between cores at kernel start. It should not be effected +// by CPU frequency. If not available use the REALTIME clock, but this may be effected by +// NTP adjustments or other user activity effecting the system time. U64 get_cpu_clock_count() { - U64 x; - __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x)); - return x; -} + struct timespec tp; + +#ifdef CLOCK_MONOTONIC + clock_gettime(CLOCK_MONOTONIC,&tp); +#else + clock_gettime(CLOCK_REALTIME,&tp); #endif + return (tp.tv_sec*LLFastTimer::sClockResolution)+tp.tv_nsec; +} +#endif // (LL_LINUX || LL_SOLARIS)) -#if LL_DARWIN || (LL_SOLARIS && defined(__sparc__)) +#if LL_DARWIN // // Mac implementation of CPU clock // @@ -115,13 +130,13 @@ U64 get_cpu_clock_count() ////////////////////////////////////////////////////////////////////////////// //static -#if LL_LINUX || LL_DARWIN || LL_SOLARIS +#if LL_DARWIN || LL_LINUX || LL_SOLARIS // Both Linux and Mac use gettimeofday for accurate time U64 LLFastTimer::countsPerSecond() { - return 1000000; // microseconds, so 1 Mhz. + return sClockResolution; // microseconds, so 1 Mhz. } -#else +#else U64 LLFastTimer::countsPerSecond() { if (!sCPUClockFrequency) diff --git a/linden/indra/llcommon/llfasttimer.h b/linden/indra/llcommon/llfasttimer.h index a32da18..2e66496 100644 --- a/linden/indra/llcommon/llfasttimer.h +++ b/linden/indra/llcommon/llfasttimer.h @@ -238,6 +238,7 @@ public: static int sPauseHistory; static int sResetHistory; static F64 sCPUClockFrequency; + static U64 sClockResolution; private: EFastTimerType mType; -- cgit v1.1