diff options
| author | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
| commit | cd2b97b3e6446449443700ae9a1521c402c93850 (patch) | |
| tree | 0c45e5a05cdcb6956fb859c9fef834a5c5613a04 /linden/indra/newview/llstylemap.h | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | Display selected avatars larger than normal, zoom in at a reasonable speed. I... (diff) | |
| download | meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.zip meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.gz meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.bz2 meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Conflicts:
linden/indra/newview/llfloaterchat.cpp
linden/indra/newview/llfloatermap.cpp
linden/indra/newview/llinventorybridge.cpp
linden/indra/newview/llnetmap.cpp
linden/indra/newview/llviewermessage.cpp
linden/indra/newview/llviewerobjectlist.cpp
Diffstat (limited to 'linden/indra/newview/llstylemap.h')
| -rw-r--r-- | linden/indra/newview/llstylemap.h | 3 |
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). |