Merge branch 'master' of git://github.com/TighMacFanatic/SingularityViewer

indra/llrender/llshadermgr.cpp

@@ -764,6 +764,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 				dumpObjectLog(ret);
 				error_str = get_object_log(ret);
 
+#if LL_WINDOWS
 				std::stringstream ostr;
 				//dump shader source for debugging
 				for (GLuint i = 0; i < count; i++)
@@ -781,6 +782,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 				}
 
 				LL_WARNS("ShaderLoading") << "\n" << ostr.str() << llendl;
+#endif // LL_WINDOWS
 				glDeleteObjectARB(ret); //no longer need handle
 				ret = 0;
 			}	

indra/newview/app_settings/windlight/water/Caribbean.xml

@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.040000002831220627</real>
+    <key>fresnelOffset</key>
+        <real>0.5</real>
+    <key>fresnelScale</key>
+        <real>0</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.029999999329447746</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.0252685546875</real>
+            <real>0.40524107217788696</real>
+            <real>0.5372314453125</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>16</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>1.0499997138977051</real>
+            <real>-0.42000007629394531</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>1.1099996566772461</real>
+            <real>-1.1600000858306885</real>
+        </array>
+    </map>
+</llsd>

indra/newview/llmeshrepository.cpp

@@ -3326,12 +3326,12 @@ void LLPhysicsDecomp::doDecompositionSingleHull()
 			}
 		}
 	}
-#endif
 
 	{
 		completeCurrent();
 		
 	}
+#endif
 }
 
 

indra/newview/skins/default/xui/en-us/notifications.xml

@@ -4339,6 +4339,13 @@ Warning: The Pay Object click action has been set, but it will only work if a sc
     </form>
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PaymentBlockedButtonMismatch"
+   type="alertmodal">
+Payment stopped: the price paid does not match any of the pay buttons set for this object.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="OpenObjectCannotCopy"