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

indra/cmake/00-Common.cmake

@@ -158,10 +158,10 @@ if (LINUX)
       add_definitions(-D_FORTIFY_SOURCE=2)
     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
   if(${CXX_VERSION} GREATER 429)
     add_definitions(-Wno-parentheses)

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
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.3.7.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libapr-1.0.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.3.8.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.3.8.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib
       )
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)

indra/cmake/Boost.cmake

@@ -10,7 +10,7 @@ if (STANDALONE)
   set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
   set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
   set(BOOST_REGEX_LIBRARY boost_regex-mt)
-  set(BOOST_SYSTEM_LIBRARY boost_system-mt)  
+  set(BOOST_SYSTEM_LIBRARY boost_system-mt)
 else (STANDALONE)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)

indra/cmake/DirectX.cmake

@@ -3,7 +3,7 @@
 if (VIEWER AND WINDOWS)
   find_path(DIRECTX_INCLUDE_DIR dxdiag.h
             "$ENV{DXSDK_DIR}/Include"
-			"$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Include"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Include"
@@ -25,7 +25,7 @@ if (VIEWER AND WINDOWS)
 
   find_path(DIRECTX_LIBRARY_DIR dxguid.lib
             "$ENV{DXSDK_DIR}/Lib/x86"
-			"$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86"
+            "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2010)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (March 2009)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (August 2008)/Lib/x86"
             "$ENV{PROGRAMFILES}/Microsoft DirectX SDK (June 2008)/Lib/x86"

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/LLPlugin.cmake

@@ -8,7 +8,7 @@ set(LLPLUGIN_INCLUDE_DIRS
 if (LINUX)
     # In order to support using ld.gold on linux, we need to explicitely
     # specify all libraries that llplugin uses.
-	set(LLPLUGIN_LIBRARIES llplugin pthread)
+    set(LLPLUGIN_LIBRARIES llplugin pthread)
 else (LINUX)
-	set(LLPLUGIN_LIBRARIES llplugin)
+    set(LLPLUGIN_LIBRARIES llplugin)
 endif (LINUX)

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,26 +30,30 @@
  * $/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
 }
 
 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;
-#if LL_FMODEX
-	ret = (void*)&FSOUND_Sound_Init;
+#ifdef LL_FMODEX
+	return (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