17 files changed, 89 insertions, 23 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 77de749..dff759e 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1541,11 +1541,23 @@ if (INSTALL)
   include(${CMAKE_CURRENT_SOURCE_DIR}/ViewerInstall.cmake)
 endif (INSTALL)
 
-ADD_VIEWER_BUILD_TEST(llagentaccess viewer)
+#ADD_VIEWER_BUILD_TEST(llagentaccess viewer)
 
 # Don't do these for DARWIN or LINUX here -- they're taken care of by viewer_manifest.py
 if (WINDOWS)
 
+  get_target_property(BUILT_LLCOMMON llcommon LOCATION)
+  add_custom_command(
+      TARGET ${VIEWER_BINARY_NAME} POST_BUILD
+      COMMAND ${CMAKE_COMMAND}
+      ARGS
+      -E
+      copy_if_different
+      ${BUILT_LLCOMMON}
+      ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
+      COMMENT "Copying llcommon.dll to the runtime folder."
+      )
+
   get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
   add_custom_command(
       TARGET ${VIEWER_BINARY_NAME} POST_BUILD
diff --git a/linden/indra/newview/emeraldboobutils.cpp b/linden/indra/newview/emeraldboobutils.cpp
index f68d6a7..f440940 100644
--- a/linden/indra/newview/emeraldboobutils.cpp
+++ b/linden/indra/newview/emeraldboobutils.cpp
@@ -1,3 +1,4 @@
+#include "linden_common.h"
 #include "emeraldboobutils.h"
 
 std::ostream &operator<<(std::ostream &os, const EmeraldGlobalBoobConfig &v)
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 8109196..5a1700a 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -5573,7 +5573,7 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode
                         !input.has("body") )
                 {
                         //what to do with badly formed message?
-                        response->status(400);
+                        response->statusUnknownError(400);
                         response->result(LLSD("Invalid message parameters"));
                 }
 
@@ -5646,7 +5646,7 @@ class LLAgentDropGroupViewerNode : public LLHTTPNode
                 else
                 {
                         //what to do with badly formed message?
-                        response->status(400);
+                        response->statusUnknownError(400);
                         response->result(LLSD("Invalid message parameters"));
                 }
         }
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 9d72457..7b3230a 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -33,6 +33,8 @@
 #ifndef LL_LLAPPVIEWER_H
 #define LL_LLAPPVIEWER_H
 
+#include "llsys.h"      // LLOSInfo
+
 class LLTextureCache;
 class LLImageDecodeThread;
 class LLTextureFetch;
diff --git a/linden/indra/newview/llfeaturemanager.cpp b/linden/indra/newview/llfeaturemanager.cpp
index 54da31b..bf43fcf 100644
--- a/linden/indra/newview/llfeaturemanager.cpp
+++ b/linden/indra/newview/llfeaturemanager.cpp
@@ -62,7 +62,6 @@
 // externs
 //
 extern LLMemoryInfo gSysMemory;
-extern LLCPUInfo gSysCPU;
 
 #if LL_DARWIN
 const char FEATURE_TABLE_FILENAME[] = "featuretable_mac.txt";
diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index 5c037d6..f7163ee 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -68,7 +68,6 @@
 #include "lldxhardware.h"
 #endif
 
-extern LLCPUInfo gSysCPU;
 extern LLMemoryInfo gSysMemory;
 extern U32 gPacketsIn;
 
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 8ae3fa2..d4ffe22 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -908,7 +908,7 @@ BOOL LLPanelRegionOpenSettingsInfo::postBuild()
         initHelpBtn("show_tags_help",   "HelpShowTags");

         initHelpBtn("allow_parcel_windlight_help", "HelpAllowParcelWindLight");

 

-        childSetAction("apply_ors_btn", sendUpdate, this);

+        childSetAction("apply_ors_btn", onClickOrs, this);

 

         refreshFromRegion(gAgent.getRegion());

 

@@ -926,12 +926,12 @@ BOOL LLPanelRegionOpenSettingsInfo::postBuild()
 // strings[7] = restrict pushobject

 // strings[8] = 'Y' - allow parcel subdivide, 'N' - not

 // strings[9] = 'Y' - block parcel search, 'N' - allow

-void LLPanelRegionOpenSettingsInfo::sendUpdate(void* userdata)

+void LLPanelRegionOpenSettingsInfo::onClickOrs(void* userdata)

 {

         LLPanelRegionOpenSettingsInfo* self;

         self = (LLPanelRegionOpenSettingsInfo*)userdata;

         

-        llinfos << "LLPanelRegionOpenSettingsInfo::sendUpdate()" << llendl;

+        llinfos << "LLPanelRegionOpenSettingsInfo::onClickOrs()" << llendl;

 

         LLSD body;

         std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");

diff --git a/linden/indra/newview/llfloaterregioninfo.h b/linden/indra/newview/llfloaterregioninfo.h
index ee01c7c..ae0c993 100644
--- a/linden/indra/newview/llfloaterregioninfo.h
+++ b/linden/indra/newview/llfloaterregioninfo.h
@@ -188,7 +188,7 @@ public:
         virtual BOOL postBuild();
 
 protected:
-        static void sendUpdate(void* userdata);
+        static void onClickOrs(void* userdata);
 };
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llfolderview.h b/linden/indra/newview/llfolderview.h
index 9fad72e..40da669 100644
--- a/linden/indra/newview/llfolderview.h
+++ b/linden/indra/newview/llfolderview.h
@@ -97,7 +97,7 @@ public:
         virtual void move( LLFolderViewEventListener* parent_listener ) = 0;
         virtual BOOL isItemCopyable() const = 0;
         virtual BOOL copyToClipboard() const = 0;
-        virtual void cutToClipboard() = 0;
+        virtual BOOL cutToClipboard() const = 0;
         virtual BOOL isClipboardPasteable() const = 0;
         virtual void pasteFromClipboard() = 0;
         virtual void buildContextMenu(LLMenuGL& menu, U32 flags) = 0;
diff --git a/linden/indra/newview/llhomelocationresponder.cpp b/linden/indra/newview/llhomelocationresponder.cpp
index e609237..c00d8e7 100644
--- a/linden/indra/newview/llhomelocationresponder.cpp
+++ b/linden/indra/newview/llhomelocationresponder.cpp
@@ -105,7 +105,8 @@ void LLHomeLocationResponder::result( const LLSD& content )
   }
 }
 
-void LLHomeLocationResponder::error( const LLSD& content )
+void LLHomeLocationResponder::error( U32 status, const std::string& reason )
 {
-  llinfos << "received error(" << ll_pretty_print_sd( content ) << ")" << llendl;
+  llinfos << "received error(" << reason  << ")" << llendl;
 }
+
diff --git a/linden/indra/newview/llhomelocationresponder.h b/linden/indra/newview/llhomelocationresponder.h
index 1e222cd..3a1d8eb 100644
--- a/linden/indra/newview/llhomelocationresponder.h
+++ b/linden/indra/newview/llhomelocationresponder.h
@@ -42,7 +42,7 @@
 class LLHomeLocationResponder : public LLHTTPClient::Responder
 {
         virtual void result( const LLSD& content );
-        virtual void error( const LLSD& content );
+        virtual void error( U32 status, const std::string& reason );
 };
 
 #endif
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 2004678..5a53aa5 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -221,7 +221,7 @@ public:
         virtual void move(LLFolderViewEventListener* new_parent_bridge) {}
         virtual BOOL isItemCopyable() const { return FALSE; }
         virtual BOOL copyToClipboard() const { return FALSE; }
-        virtual void cutToClipboard() {}
+        virtual BOOL cutToClipboard() const { return FALSE; }
         virtual BOOL isClipboardPasteable() const;
         virtual void pasteFromClipboard() {}
         void getClipboardEntries(bool show_asset_id, std::vector<std::string> &items, 
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 9cd2759..277ab15 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -145,7 +145,7 @@ public:
         virtual void move(LLFolderViewEventListener* parent_listener);
         virtual BOOL isItemCopyable() const;
         virtual BOOL copyToClipboard() const;
-        virtual void cutToClipboard();
+        virtual BOOL cutToClipboard() const;
         virtual BOOL isClipboardPasteable() const;
         virtual void pasteFromClipboard();
         virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
@@ -594,8 +594,9 @@ BOOL LLTaskInvFVBridge::copyToClipboard() const
         return FALSE;
 }
 
-void LLTaskInvFVBridge::cutToClipboard()
+BOOL LLTaskInvFVBridge::cutToClipboard() const
 {
+        return FALSE;
 }
 
 BOOL LLTaskInvFVBridge::isClipboardPasteable() const
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index c1d5ff3..d9fa5b5 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -826,7 +826,7 @@ class LLSpatialSetStateDiff : public LLSpatialSetState
 public:
         LLSpatialSetStateDiff(U32 state) : LLSpatialSetState(state) { }
 
-        virtual void traverse(const LLSpatialGroup::TreeNode* n)
+        virtual void traverse(const LLSpatialGroup::OctreeNode* n)
         {
                 LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
                 
@@ -885,7 +885,7 @@ class LLSpatialClearStateDiff : public LLSpatialClearState
 public:
         LLSpatialClearStateDiff(U32 state) : LLSpatialClearState(state) { }
 
-        virtual void traverse(const LLSpatialGroup::TreeNode* n)
+        virtual void traverse(const LLSpatialGroup::OctreeNode* n)
         {
                 LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
                 
@@ -1519,7 +1519,7 @@ public:
                 return false;
         }
         
-        virtual void traverse(const LLSpatialGroup::TreeNode* n)
+        virtual void traverse(const LLSpatialGroup::OctreeNode* n)
         {
                 LLSpatialGroup* group = (LLSpatialGroup*) n->getListener(0);
 
diff --git a/linden/indra/newview/llviewerassetstorage.h b/linden/indra/newview/llviewerassetstorage.h
index 15c11c7..512b590 100644
--- a/linden/indra/newview/llviewerassetstorage.h
+++ b/linden/indra/newview/llviewerassetstorage.h
@@ -47,6 +47,7 @@ public:
         LLViewerAssetStorage(LLMessageSystem *msg, LLXferManager *xfer,
                                    LLVFS *vfs);
 
+        using LLAssetStorage::storeAssetData;
         virtual void storeAssetData(
                 const LLTransactionID& tid,
                 LLAssetType::EType atype,
diff --git a/linden/indra/newview/llwatchdog.h b/linden/indra/newview/llwatchdog.h
index ed7d5bd..1a10e33 100644
--- a/linden/indra/newview/llwatchdog.h
+++ b/linden/indra/newview/llwatchdog.h
@@ -64,9 +64,10 @@ public:
 
         /* virtual */ bool isAlive() const;
         /* virtual */ void reset();
-        /* virtual */ void start(const std::string& state); 
+        /* virtual */ void start() { start(""); };
         /* virtual */ void stop();
 
+        void start(const std::string& state);
         void setTimeout(F32 d);
         void ping(const std::string& state);
         const std::string& getState() {return mPingState; }
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index cc22748..f9c34d6 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -230,7 +230,7 @@ class WindowsManifest(ViewerManifest):
             self.path("LICENSE-libraries.txt")
             self.end_prefix("../..")
 
-                
+
         self.path("imprudence.url")
 
         # Plugin host application
@@ -252,6 +252,14 @@ class WindowsManifest(ViewerManifest):
             self.path("libhunspell.dll")
             self.end_prefix()
 
+        # Get llcommon and deps.
+        if self.prefix(src=self.args['configuration'], dst=""):
+            self.path('libapr-1.dll')
+            self.path('libaprutil-1.dll')
+            self.path('libapriconv-1.dll')
+            self.path('llcommon.dll')
+            self.end_prefix()
+
         # For textures
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
             self.path("openjpeg.dll")
@@ -731,14 +739,51 @@ class DarwinManifest(ViewerManifest):
                 self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
                 #self.path("vivox-runtime/universal-darwin/SLVoiceAgent.app", "SLVoiceAgent.app")
 
+                libdir = "../../libraries/universal-darwin/lib_release"
+                dylibs = {}
+
+                #for lib in "llkdu", "llcommon":
+                for lib in "llcommon":
+                    libfile = "lib%s.dylib" % lib
+                    try:
+                        self.path(self.find_existing_file(os.path.join(os.pardir,
+                                                                       lib,
+                                                                       self.args['configuration'],
+                                                                       libfile),
+                                                          os.path.join(libdir, libfile)),
+                                  dst=libfile)
+                    except RuntimeError:
+                        print "Skipping %s" % libfile
+                        dylibs[lib] = False
+                    else:
+                        dylibs[lib] = True
+
+                for libfile in ("libapr-1.0.3.7.dylib",
+                                "libaprutil-1.0.3.8.dylib",
+                                "libexpat.0.5.0.dylib"):
+                    self.path(os.path.join(libdir, libfile), libfile)
+
                 #libfmodwrapper.dylib
                 #self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
                 
                 # our apps
 #                self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
                 self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app")
-                
-                # plugin launcher
+
+                # our apps dependencies on shared libs
+                mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources")
+                mac_updater_res_path = self.dst_path_of("mac-updater.app/Contents/Resources")
+                for libfile in ("libllcommon.dylib",
+                                "libapr-1.0.3.7.dylib",
+                                "libaprutil-1.0.3.8.dylib",
+                                "libexpat.0.5.0.dylib"):
+                    target_lib = os.path.join('../../..', libfile)
+                    self.run_command("ln -sf %(target)r %(link)r" %
+                                     {'target': target_lib,
+                                      'link' : os.path.join(mac_crash_logger_res_path, libfile)}
+                                    )
+
+                # plugin launcher
                 self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin")
 
                 # plugins
@@ -952,6 +997,8 @@ class Linux_i686Manifest(LinuxManifest):
         else:
             self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 
+        self.path("../llcommon/libllcommon.so", "lib/libllcommon.so")
+
         if (not self.standalone()) and self.prefix("../../libraries/i686-linux/lib_release_client", dst="lib"):
             self.path("libapr-1.so.0")
             self.path("libaprutil-1.so.0")
@@ -1072,6 +1119,8 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin")
 #        self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin")
 
+        self.path("../llcommon/libllcommon.so", "lib64/libllcommon.so")
+
         self.path("linux_tools/launch_url.sh","launch_url.sh")
         if self.prefix("res-sdl"):
             self.path("*")