Merge commit 'jacek/next' into next

4 files changed, 35 insertions, 12 deletions

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;
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<LLMenuItemCallGL>("Set Away", TRUE);
         gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("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 1b36bca..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
@@ -29,15 +29,21 @@
       <on_click function="File.UploadBulk" userdata="" />
     </menu_item_call>
     <menu_item_separator />
-          <menu_item_call name="Import" label="Import" enabled="false">
+          <menu_item_call name="Import" label="Import Object..." enabled="false">
       <on_click function="Object.Import" />
       <on_enable function="Object.EnableImport" />
     </menu_item_call>
-    <menu_item_call name="Upload + Import" label="Upload + Import"
+    <menu_item_call name="ImportUpload"
+                    label="Import + Upload...  (L$[COST] per texture)"
                     enabled="false">
       <on_click function="Object.ImportUpload" />
       <on_enable function="Object.EnableImport" />
     </menu_item_call>
+    <menu_item_call name="Export" label="Export Selected Objects..."
+                    enabled="false">
+      <on_click function="Object.Export" />
+      <on_enable function="Object.EnableExport" />
+    </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Close Window"
                     label="Close Window"