Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Conflicts:
	indra/llrender/llpostprocess.cpp

indra/llwindow/llkeyboardwin32.cpp

@@ -269,7 +269,7 @@ void LLKeyboardWin32::scanKeyboard()
 				// keydown in highest bit
 				if (!mControllerKeys[key] && !pending_key_events && !(GetAsyncKeyState(virtual_key) & 0x8000))
 				{
- 					//llinfos << "Key up event missed, resetting" << llendl;
+ 					//LL_INFOS() << "Key up event missed, resetting" << LL_ENDL;
 					mKeyLevel[key] = FALSE;
 				}
 			}

indra/llwindow/llkeyboardwin32.h

@@ -2,31 +2,25 @@
  * @file llkeyboardwin32.h
  * @brief Handler for assignable key bindings
  *
- * $LicenseInfo:firstyear=2004&license=viewergpl$
- * 
- * Copyright (c) 2004-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2004&license=viewerlgpl$
  * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 

indra/llwindow/llwindowsdl.cpp

@@ -2561,8 +2561,8 @@ void LLWindowSDL::spawnWebBrowser(const std::string& escaped_url, bool async)
 	std::string cmd, arg;
 	cmd  = gDirUtilp->getAppRODataDir();
 	cmd += gDirUtilp->getDirDelimiter();
-	//cmd += "etc";
-	//cmd += gDirUtilp->getDirDelimiter();
+	cmd += "etc";
+	cmd += gDirUtilp->getDirDelimiter();
 	cmd += "launch_url.sh";
 	arg = escaped_url;
 	exec_cmd(cmd, arg);

indra/llwindow/llwindowwin32.cpp

@@ -3820,11 +3820,11 @@ LLWindowCallbacks::DragNDropResult LLWindowWin32::completeDragNDropRequest( cons
 // When it handled the message, the value to be returned from
 // the Window Procedure is set to *result.
 
-BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
+BOOL LLWindowWin32::handleImeRequests(WPARAM w_param, LPARAM l_param, LRESULT *result)
 {
 	if ( mPreeditor )
 	{
-		switch (request)
+		switch (w_param)
 		{
 			case IMR_CANDIDATEWINDOW:		// http://msdn2.microsoft.com/en-us/library/ms776080.aspx
 			{
@@ -3832,7 +3832,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 				LLRect preedit_bounds;
 				mPreeditor->getPreeditLocation(-1, &caret_coord, &preedit_bounds, NULL);
 				
-				CANDIDATEFORM *const form = (CANDIDATEFORM *)param;
+				CANDIDATEFORM *const form = (CANDIDATEFORM *)l_param;
 				DWORD const dwIndex = form->dwIndex;
 				fillCandidateForm(caret_coord, preedit_bounds, form);
 				form->dwIndex = dwIndex;
@@ -3842,7 +3842,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 			}
 			case IMR_QUERYCHARPOSITION:
 			{
-				IMECHARPOSITION *const char_position = (IMECHARPOSITION *)param;
+				IMECHARPOSITION *const char_position = (IMECHARPOSITION *)l_param;
 
 				// char_position->dwCharPos counts in number of
 				// WCHARs, i.e., UTF-16 encoding units, so we can't simply pass the
@@ -3867,7 +3867,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 			}
 			case IMR_COMPOSITIONFONT:
 			{
-				fillCompositionLogfont((LOGFONT *)param);
+				fillCompositionLogfont((LOGFONT *)l_param);
 
 				*result = 1;
 				return TRUE;
@@ -3882,7 +3882,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 				S32 context_offset;
 				const LLWString context = find_context(wtext, select, select_length, &context_offset);
 
-				RECONVERTSTRING * const reconvert_string = (RECONVERTSTRING *)param;
+				RECONVERTSTRING * const reconvert_string = (RECONVERTSTRING *)l_param;
 				const U32 size = fillReconvertString(context, select - context_offset, select_length, reconvert_string);
 				if (reconvert_string)
 				{
@@ -3932,7 +3932,7 @@ BOOL LLWindowWin32::handleImeRequests(U32 request, U32 param, LRESULT *result)
 					context.erase(preedit, preedit_length);
 				}
 				
-				RECONVERTSTRING *reconvert_string = (RECONVERTSTRING *)param;
+				RECONVERTSTRING *reconvert_string = (RECONVERTSTRING *)l_param;
 				*result = fillReconvertString(context, preedit, 0, reconvert_string);
 				return TRUE;
 			}

indra/llwindow/llwindowwin32.h

@@ -152,7 +152,7 @@ protected:
 	U32		fillReconvertString(const LLWString &text, S32 focus, S32 focus_length, RECONVERTSTRING *reconvert_string);
 	void	handleStartCompositionMessage();
 	void	handleCompositionMessage(U32 indexes);
-	BOOL	handleImeRequests(U32 request, U32 param, LRESULT *result);
+	BOOL	handleImeRequests(WPARAM request, LPARAM param, LRESULT *result);
 
 protected:
 	//