Merge git://github.com/LightDrake/SingularityViewer

.gitignore

@@ -18,6 +18,7 @@
 *.rej
 *.bak
 *~
+*.DS_Store
 /LICENSES/
 /edited-files.txt
 qtcreator-build/

indra/cmake/00-Common.cmake

@@ -159,7 +159,7 @@ if (LINUX)
     endif (NOT ${GXX_VERSION} MATCHES " 4.1.*Red Hat")
   endif (${GXX_VERSION} STREQUAL ${CXX_VERSION})
 
-  #Lets actualy get a numerical version of gxx's version
+  #Lets actually get a numerical version of gxx's version
   STRING(REGEX REPLACE ".* ([0-9])\\.([0-9])\\.([0-9]).*" "\\1\\2\\3" CXX_VERSION ${CXX_VERSION})
 
   #gcc 4.3 and above don't like the LL boost

indra/cmake/APR.cmake

@@ -29,12 +29,12 @@ else (STANDALONE)
       )
   elseif (DARWIN)
     set(APR_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.3.7.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib
       )
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)

indra/cmake/LLCommon.cmake

@@ -14,6 +14,7 @@ endif (DARWIN)
 set(LLCOMMON_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/cwdebug
     ${LIBS_OPEN_DIR}/llcommon
+    ${APRUTIL_INCLUDE_DIR}
     ${APR_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
     )

indra/cmake/Python.cmake

@@ -19,7 +19,6 @@ if (WINDOWS)
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
     [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
-
     )
 elseif (EXISTS /etc/debian_version)
   # On Debian and Ubuntu, avoid Python 2.4 if possible.

indra/newview/fmodwrapper.cpp

@@ -30,12 +30,17 @@
  * $/LicenseInfo$
  */
 
+//Hack to build Darwin.
+//Need to find a better way to do this later. 
+#define LL_FMOD
+
 extern "C"
 {
-#if LL_FMODEX
+#ifdef LL_FMODEX
 	void FSOUND_Sound_Init(void);
 #endif
-#if LL_FMOD
+
+#ifdef LL_FMOD
 	void FSOUND_Init(void);
 #endif
 }
@@ -44,12 +49,11 @@ void* fmodwrapper(void)
 {		
 	// When building the fmodwrapper library, the linker doesn't seem to want to bring in libfmod.a unless I explicitly
 	// reference at least one symbol in the library.  This seemed like the simplest way.
-	void *ret = NULL;
+#ifdef LL_FMODEX
-#if LL_FMODEX
+	return (void*)&FSOUND_Sound_Init;
-	ret = (void*)&FSOUND_Sound_Init;
 #endif
-#if LL_FMOD
+
-	ret = (void*)&FSOUND_Init;
+#ifdef LL_FMOD
+	return (void*)&FSOUND_Init;
 #endif
-	return ret;
 }

indra/newview/llpreviewscript.cpp

@@ -2301,6 +2301,13 @@ void LLLiveLSLEditor::saveIfNeeded()
 		return;
 	}
 
+// [RLVa:KB] - Checked: 2010-11-25 (RLVa-1.2.2b) | Modified: RLVa-1.2.2b
+	if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.isLockedAttachment(object->getRootEdit())) )
+	{
+		return;
+	}
+// [/RLVa:KB]
+
 	// get the latest info about it. We used to be losing the script
 	// name on save, because the viewer object version of the item,
 	// and the editor version would get out of synch. Here's a good
@@ -2607,14 +2614,6 @@ void LLLiveLSLEditor::onSave(void* userdata, BOOL close_after_save)
 {
 	LLLiveLSLEditor* self = (LLLiveLSLEditor*)userdata;
 
-// [RLVa:KB] - Checked: 2010-09-28 (RLVa-1.2.1f) | Modified: RLVa-1.0.5a
-	const LLViewerObject* pObject = gObjectList.findObject(self->mObjectID);
-	if ( (rlv_handler_t::isEnabled()) && (gRlvAttachmentLocks.isLockedAttachment(pObject->getRootEdit())) )
-	{
-		return;
-	}
-// [/RLVa:KB]
-
 	self->mCloseAfterSave = close_after_save;
 	self->saveIfNeeded();
 }

indra/newview/llstartup.cpp

@@ -3492,7 +3492,7 @@ bool update_dialog_callback(const LLSD& notification, const LLSD& response)
 	LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" -name \"";
 	LLAppViewer::sUpdaterInfo->mUpdateExePath += LLAppViewer::instance()->getSecondLifeTitle();
 	LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" -bundleid \"";
-	LLAppViewer::sUpdaterInfo->mUpdateExePath += LL_VERSION_BUNDLE_ID;
+	LLAppViewer::sUpdaterInfo->mUpdateExePath += gVersionBundleID;
 	LLAppViewer::sUpdaterInfo->mUpdateExePath += "\" &";
 
 	LL_DEBUGS("AppInit") << "Calling updater: " << LLAppViewer::sUpdaterInfo->mUpdateExePath << LL_ENDL;

indra/newview/sgversion.cpp

@@ -28,3 +28,6 @@ const S32 gVersionBuild = LL_VERSION_BUILD;
 
 const char* gVersionChannel = LL_CHANNEL;
 
+#if LL_DARWIN
+const char* gVersionBundleID = LL_VERSION_BUNDLE_ID;
+#endif

indra/newview/sgversion.h

@@ -25,5 +25,8 @@ extern const S32 gVersionBuild;
 
 extern const char* gVersionChannel;
 
+#if LL_DARWIN
+extern const char* gVersionBundleID;
+#endif
 
 #endif

indra/newview/viewer_manifest.py

@@ -514,8 +514,8 @@ class DarwinManifest(ViewerManifest):
                 libfile = "lib%s.dylib"
                 libdir = "../../libraries/universal-darwin/lib_release"
 
-                for libfile in ("libapr-1.0.3.7.dylib",
+                for libfile in ("libapr-1.0.dylib",
-                                "libaprutil-1.0.3.8.dylib",
+                                "libaprutil-1.0.dylib",
                                 "libexpat.0.5.0.dylib"):
                     self.path(os.path.join(libdir, libfile), libfile)
 
@@ -541,8 +541,8 @@ class DarwinManifest(ViewerManifest):
                 mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources")
                 slplugin_res_path = self.dst_path_of("SLPlugin.app/Contents/Resources")
                 for libfile in ("libllcommon.dylib",
-                                "libapr-1.0.3.7.dylib",
+                                "libapr-1.0.dylib",
-                                "libaprutil-1.0.3.8.dylib",
+                                "libaprutil-1.0.dylib",
                                 "libexpat.0.5.0.dylib"):
                     target_lib = os.path.join('../../..', libfile)
                     self.run_command("ln -sf %(target)r %(link)r" %

install.xml

@@ -90,9 +90,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>115d8ac44a91efdb173e9b3e478c46b6</string>
+            <string>2486db13c5ed9340855da3c1c48772af</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090805.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/SingularityViewer/apr_suite-1.4.2-darwin-20110217.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -1300,9 +1300,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>c844e1b05723ce078dbbd5aea9cdd3ad</string>
+            <string>58ef62004b508b234039f6a313d852eb</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.1.4-darwin-20080818.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/SingularityViewer/zlib-1.2.5-darwin-20110211.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>