Backported clickable object names from 1.23

4 files changed, 176 insertions, 2 deletions

diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index 4001e1f..3f14be6 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -20,6 +20,7 @@ set(llcommon_SOURCE_FILES
     llcommon.cpp
     llcrc.cpp
     llcriticaldamp.cpp
+    llcursortypes.cpp
     lldate.cpp
     llerror.cpp
     llerrorthread.cpp
@@ -90,6 +91,7 @@ set(llcommon_HEADER_FILES
     llcommon.h
     llcrc.h
     llcriticaldamp.h
+    llcursortypes.h
     lldarray.h
     lldarrayptr.h
     lldate.h
diff --git a/linden/indra/llcommon/llchat.h b/linden/indra/llcommon/llchat.h
index 1bb3f3b..ec86450 100644
--- a/linden/indra/llcommon/llchat.h
+++ b/linden/indra/llcommon/llchat.h
@@ -77,9 +77,10 @@ public:
                 mAudible(CHAT_AUDIBLE_FULLY),
                 mMuted(FALSE),
                 mTime(0.0),
-                mPosAgent()
+                mPosAgent(),
+                mURL()
         { }
-        
+
         std::string             mText;          // UTF-8 line of text
         std::string             mFromName;      // agent or object name
         LLUUID                  mFromID;        // agent id or object id
@@ -89,6 +90,7 @@ public:
         BOOL                    mMuted;         // pass muted chat to maintain list of chatters
         F64                             mTime;          // viewer only, seconds from viewer start
         LLVector3               mPosAgent;
+        std::string             mURL;
 };
 
 #endif
diff --git a/linden/indra/llcommon/llcursortypes.cpp b/linden/indra/llcommon/llcursortypes.cpp
new file mode 100644
index 0000000..858414b
--- /dev/null
+++ b/linden/indra/llcommon/llcursortypes.cpp
@@ -0,0 +1,89 @@
+/**
+ * @file llcursortypes.cpp
+ * @brief Cursor types and lookup of types from a string
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008, 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
+ * ("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
+ *
+ * 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
+ *
+ * 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.
+ * $/LicenseInfo$
+ */
+
+#include "llcursortypes.h"
+
+ECursorType getCursorFromString(const std::string& cursor_string)
+{
+        static std::map<std::string,U32> cursor_string_table;
+        if (cursor_string_table.empty())
+        {
+                cursor_string_table["UI_CURSOR_ARROW"] = UI_CURSOR_ARROW;
+                cursor_string_table["UI_CURSOR_WAIT"] = UI_CURSOR_WAIT;
+                cursor_string_table["UI_CURSOR_HAND"] = UI_CURSOR_HAND;
+                cursor_string_table["UI_CURSOR_IBEAM"] = UI_CURSOR_IBEAM;
+                cursor_string_table["UI_CURSOR_CROSS"] = UI_CURSOR_CROSS;
+                cursor_string_table["UI_CURSOR_SIZENWSE"] = UI_CURSOR_SIZENWSE;
+                cursor_string_table["UI_CURSOR_SIZENESW"] = UI_CURSOR_SIZENESW;
+                cursor_string_table["UI_CURSOR_SIZEWE"] = UI_CURSOR_SIZEWE;
+                cursor_string_table["UI_CURSOR_SIZENS"] = UI_CURSOR_SIZENS;
+                cursor_string_table["UI_CURSOR_NO"] = UI_CURSOR_NO;
+                cursor_string_table["UI_CURSOR_WORKING"] = UI_CURSOR_WORKING;
+                cursor_string_table["UI_CURSOR_TOOLGRAB"] = UI_CURSOR_TOOLGRAB;
+                cursor_string_table["UI_CURSOR_TOOLLAND"] = UI_CURSOR_TOOLLAND;
+                cursor_string_table["UI_CURSOR_TOOLFOCUS"] = UI_CURSOR_TOOLFOCUS;
+                cursor_string_table["UI_CURSOR_TOOLCREATE"] = UI_CURSOR_TOOLCREATE;
+                cursor_string_table["UI_CURSOR_ARROWDRAG"] = UI_CURSOR_ARROWDRAG;
+                cursor_string_table["UI_CURSOR_ARROWCOPY"] = UI_CURSOR_ARROWCOPY;
+                cursor_string_table["UI_CURSOR_ARROWDRAGMULTI"] = UI_CURSOR_ARROWDRAGMULTI;
+                cursor_string_table["UI_CURSOR_ARROWCOPYMULTI"] = UI_CURSOR_ARROWCOPYMULTI;
+                cursor_string_table["UI_CURSOR_NOLOCKED"] = UI_CURSOR_NOLOCKED;
+                cursor_string_table["UI_CURSOR_ARROWLOCKED"] = UI_CURSOR_ARROWLOCKED;
+                cursor_string_table["UI_CURSOR_GRABLOCKED"] = UI_CURSOR_GRABLOCKED;
+                cursor_string_table["UI_CURSOR_TOOLTRANSLATE"] = UI_CURSOR_TOOLTRANSLATE;
+                cursor_string_table["UI_CURSOR_TOOLROTATE"] = UI_CURSOR_TOOLROTATE;
+                cursor_string_table["UI_CURSOR_TOOLSCALE"] = UI_CURSOR_TOOLSCALE;
+                cursor_string_table["UI_CURSOR_TOOLCAMERA"] = UI_CURSOR_TOOLCAMERA;
+                cursor_string_table["UI_CURSOR_TOOLPAN"] = UI_CURSOR_TOOLPAN;
+                cursor_string_table["UI_CURSOR_TOOLZOOMIN"] = UI_CURSOR_TOOLZOOMIN;
+                cursor_string_table["UI_CURSOR_TOOLPICKOBJECT3"] = UI_CURSOR_TOOLPICKOBJECT3;
+                cursor_string_table["UI_CURSOR_TOOLSIT"] = UI_CURSOR_TOOLSIT;
+                cursor_string_table["UI_CURSOR_TOOLBUY"] = UI_CURSOR_TOOLBUY;
+                cursor_string_table["UI_CURSOR_TOOLPAY"] = UI_CURSOR_TOOLPAY;
+                cursor_string_table["UI_CURSOR_TOOLOPEN"] = UI_CURSOR_TOOLOPEN;
+                cursor_string_table["UI_CURSOR_TOOLPLAY"] = UI_CURSOR_TOOLPLAY;
+                cursor_string_table["UI_CURSOR_TOOLPAUSE"] = UI_CURSOR_TOOLPAUSE;
+                cursor_string_table["UI_CURSOR_TOOLMEDIAOPEN"] = UI_CURSOR_TOOLMEDIAOPEN;
+                cursor_string_table["UI_CURSOR_PIPETTE"] = UI_CURSOR_PIPETTE;
+        }
+
+        std::map<std::string,U32>::const_iterator iter = cursor_string_table.find(cursor_string);
+
+        if (iter != cursor_string_table.end())
+        {
+                return (ECursorType)iter->second;
+        }
+
+        return UI_CURSOR_ARROW;
+}
+
+
+
diff --git a/linden/indra/llcommon/llcursortypes.h b/linden/indra/llcommon/llcursortypes.h
new file mode 100644
index 0000000..9be064f
--- /dev/null
+++ b/linden/indra/llcommon/llcursortypes.h
@@ -0,0 +1,81 @@
+/**
+ * @file llcursortypes.h
+ * @brief Cursor types
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ *
+ * Copyright (c) 2008, 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
+ * ("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
+ *
+ * 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
+ *
+ * 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.
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLCURSORTYPES_H
+#define LL_LLCURSORTYPES_H
+
+#include "linden_common.h"
+
+// If you add types here, add them in LLCursor::getCursorFromString
+enum ECursorType {
+        UI_CURSOR_ARROW,
+        UI_CURSOR_WAIT,
+        UI_CURSOR_HAND,
+        UI_CURSOR_IBEAM,
+        UI_CURSOR_CROSS,
+        UI_CURSOR_SIZENWSE,
+        UI_CURSOR_SIZENESW,
+        UI_CURSOR_SIZEWE,
+        UI_CURSOR_SIZENS,
+        UI_CURSOR_NO,
+        UI_CURSOR_WORKING,
+        UI_CURSOR_TOOLGRAB,
+        UI_CURSOR_TOOLLAND,
+        UI_CURSOR_TOOLFOCUS,
+        UI_CURSOR_TOOLCREATE,
+        UI_CURSOR_ARROWDRAG,
+        UI_CURSOR_ARROWCOPY,    // drag with copy
+        UI_CURSOR_ARROWDRAGMULTI,
+        UI_CURSOR_ARROWCOPYMULTI,       // drag with copy
+        UI_CURSOR_NOLOCKED,
+        UI_CURSOR_ARROWLOCKED,
+        UI_CURSOR_GRABLOCKED,
+        UI_CURSOR_TOOLTRANSLATE,
+        UI_CURSOR_TOOLROTATE,
+        UI_CURSOR_TOOLSCALE,
+        UI_CURSOR_TOOLCAMERA,
+        UI_CURSOR_TOOLPAN,
+        UI_CURSOR_TOOLZOOMIN,
+        UI_CURSOR_TOOLPICKOBJECT3,
+        UI_CURSOR_TOOLSIT,
+        UI_CURSOR_TOOLBUY,
+        UI_CURSOR_TOOLPAY,
+        UI_CURSOR_TOOLOPEN,
+        UI_CURSOR_TOOLPLAY,
+        UI_CURSOR_TOOLPAUSE,
+        UI_CURSOR_TOOLMEDIAOPEN,
+        UI_CURSOR_PIPETTE,
+        UI_CURSOR_COUNT                 // Number of elements in this enum (NOT a cursor)
+};
+
+ECursorType getCursorFromString(const std::string& cursor_string);
+
+#endif // LL_LLCURSORTYPES_H