svn merge -r 58902:58986 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 44 insertions, 44 deletions

diff --git a/indra/llui/llctrlselectioninterface.cpp b/indra/llui/llctrlselectioninterface.cpp
index a58fb88e75..61044aa7da 100644
--- a/indra/llui/llctrlselectioninterface.cpp
+++ b/indra/llui/llctrlselectioninterface.cpp
@@ -1,44 +1,44 @@
-/** 

- * @file llctrlselectioninterface.cpp

- * @brief Programmatic selection of items in a list.

- *

- * Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.

- * $License$

- */

-

-#include "llctrlselectioninterface.h"

-

-#include "llsd.h"

-

-// virtual

-LLCtrlSelectionInterface::~LLCtrlSelectionInterface()

-{ }

-

-BOOL LLCtrlSelectionInterface::selectByValue(LLSD value)

-{

-	return setSelectedByValue(value, TRUE);

-}

-

-BOOL LLCtrlSelectionInterface::deselectByValue(LLSD value)

-{ 

-	return setSelectedByValue(value, FALSE); 

-}

-

-

-// virtual

-LLCtrlListInterface::~LLCtrlListInterface()

-{ }

-

-LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value)

-{

-	return addSimpleElement(value, ADD_BOTTOM, LLSD());

-}

-

-LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value, EAddPosition pos)

-{

-	return addSimpleElement(value, pos, LLSD());

-}

-

-// virtual

-LLCtrlScrollInterface::~LLCtrlScrollInterface()

-{ }

+/** 
+ * @file llctrlselectioninterface.cpp
+ * @brief Programmatic selection of items in a list.
+ *
+ * Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#include "llctrlselectioninterface.h"
+
+#include "llsd.h"
+
+// virtual
+LLCtrlSelectionInterface::~LLCtrlSelectionInterface()
+{ }
+
+BOOL LLCtrlSelectionInterface::selectByValue(LLSD value)
+{
+	return setSelectedByValue(value, TRUE);
+}
+
+BOOL LLCtrlSelectionInterface::deselectByValue(LLSD value)
+{ 
+	return setSelectedByValue(value, FALSE); 
+}
+
+
+// virtual
+LLCtrlListInterface::~LLCtrlListInterface()
+{ }
+
+LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value)
+{
+	return addSimpleElement(value, ADD_BOTTOM, LLSD());
+}
+
+LLScrollListItem* LLCtrlListInterface::addSimpleElement(const LLString& value, EAddPosition pos)
+{
+	return addSimpleElement(value, pos, LLSD());
+}
+
+// virtual
+LLCtrlScrollInterface::~LLCtrlScrollInterface()
+{ }