Merge branch 'master' of https://github.com/LightDrake/SingularityViewer

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