Merge remote branch 'mccabe/1.3.0-next' into next

Conflicts:
	linden/indra/cmake/00-Common.cmake
	linden/indra/newview/skins/default/xui/de/floater_about.xml
	linden/indra/newview/skins/default/xui/fr/floater_about.xml
	linden/indra/newview/skins/default/xui/ja/floater_about.xml
	linden/indra/newview/skins/default/xui/ko/floater_about.xml
	linden/indra/newview/skins/default/xui/zh/floater_about.xml
	linden/install.xml

1 files changed, 13 insertions, 12 deletions

diff --git a/linden/indra/newview/llfloaterobjectiminfo.h b/linden/indra/newview/llfloaterobjectiminfo.h
index 0564c3e..55f8bba 100644
--- a/linden/indra/newview/llfloaterobjectiminfo.h
+++ b/linden/indra/newview/llfloaterobjectiminfo.h
@@ -1,11 +1,11 @@
-/**
+/** 
  * @file llfloaterobjectiminfo.h
  * @brief Shows a dialog with information about an object.
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
- *
- * Copyright (c) 2006-2008, Linden Research, Inc.
- *
+ * 
+ * Copyright (c) 2006-2009, Linden Research, Inc.
+ * 
  * 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
@@ -13,16 +13,17 @@
  * ("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
- *
+ * 
  * 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
- *
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
  * 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.
@@ -35,10 +36,10 @@
 namespace LLObjectIMInfo
 {
         // Show an LLFloaterObjectIMInfo for this object.
-        static void show(const LLUUID& object_id,
-                                                const std::string& name,
-                                                const std::string& location,
-                                                const LLUUID& owner_id,
+        static void show(const LLUUID& object_id, 
+                                                const std::string& name, 
+                                                const std::string& location, 
+                                                const LLUUID& owner_id, 
                                                 bool owner_is_group);
 };