aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstylemap.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-11 00:33:33 -0700
committerMcCabe Maxsted2009-09-11 00:33:33 -0700
commitefa0d701845542e9ef555260fe6d2ad0beeb0760 (patch)
tree4527fe04a062d3353e4d1a77c547d1c2b1d475e9 /linden/indra/newview/llstylemap.h
parentFixed missing 'm' for draw distance slider (diff)
downloadmeta-impy-efa0d701845542e9ef555260fe6d2ad0beeb0760.zip
meta-impy-efa0d701845542e9ef555260fe6d2ad0beeb0760.tar.gz
meta-impy-efa0d701845542e9ef555260fe6d2ad0beeb0760.tar.bz2
meta-impy-efa0d701845542e9ef555260fe6d2ad0beeb0760.tar.xz
Backported clickable object names from 1.23
Diffstat (limited to 'linden/indra/newview/llstylemap.h')
-rw-r--r--linden/indra/newview/llstylemap.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llstylemap.h b/linden/indra/newview/llstylemap.h
index a38d253..f1eada9 100644
--- a/linden/indra/newview/llstylemap.h
+++ b/linden/indra/newview/llstylemap.h
@@ -47,7 +47,8 @@ public:
47 LLStyleMap(); 47 LLStyleMap();
48 ~LLStyleMap(); 48 ~LLStyleMap();
49 // Just like the [] accessor but it will add the entry in if it doesn't exist. 49 // Just like the [] accessor but it will add the entry in if it doesn't exist.
50 const LLStyleSP &lookup(const LLUUID &source); 50 const LLStyleSP &lookupAgent(const LLUUID &source);
51 const LLStyleSP &lookup(const LLUUID &source, const std::string& link);
51 static LLStyleMap &instance(); 52 static LLStyleMap &instance();
52 53
53 // Forces refresh of the entries, call when something changes (e.g. link color). 54 // Forces refresh of the entries, call when something changes (e.g. link color).