summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-11 17:26:29 -0700
committerJames Cook <james@lindenlab.com>2010-05-11 17:26:29 -0700
commit31a0d236d59de5eaaa9e33ed99e6971c1ee01ad7 (patch)
tree9ffd3705becc2a5f2d21367b184173fd21e25857 /indra/llui
parent2b7153c26a6dd5284218253910f466a0faeff708 (diff)
Clean up merge-fight about getIcon() const-ness
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llurlentry.cpp4
-rw-r--r--indra/llui/llurlentry.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index f3e1a07fbc..f9e5bd76d0 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -62,7 +62,7 @@ std::string LLUrlEntryBase::getUrl(const std::string &string) const
}
//virtual
-std::string LLUrlEntryBase::getIcon(const std::string &url) const
+std::string LLUrlEntryBase::getIcon(const std::string &url)
{
return mIcon;
}
@@ -464,7 +464,7 @@ std::string localize_slapp_label(const std::string& url, const std::string& full
}
-std::string LLUrlEntryAgent::getIcon(const std::string &url) const
+std::string LLUrlEntryAgent::getIcon(const std::string &url)
{
// *NOTE: Could look up a badge here by calling getIDStringFromUrl()
// and looking up the badge for the agent.
diff --git a/indra/llui/llurlentry.h b/indra/llui/llurlentry.h
index d89f647a55..0abf7a603f 100644
--- a/indra/llui/llurlentry.h
+++ b/indra/llui/llurlentry.h
@@ -80,7 +80,7 @@ public:
virtual std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb) { return url; }
/// Return an icon that can be displayed next to Urls of this type
- virtual std::string getIcon(const std::string &url) const;
+ virtual std::string getIcon(const std::string &url);
/// Return the color to render the displayed text
LLUIColor getColor() const { return mColor; }
@@ -171,7 +171,7 @@ class LLUrlEntryAgent : public LLUrlEntryBase
public:
LLUrlEntryAgent();
/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
- /*virtual*/ std::string getIcon(const std::string &url) const;
+ /*virtual*/ std::string getIcon(const std::string &url);
/*virtual*/ std::string getTooltip(const std::string &string) const;
protected:
/*virtual*/ void callObservers(const std::string &id, const std::string &label, const std::string& icon);
@@ -308,7 +308,7 @@ public:
LLUrlEntryIcon();
/*virtual*/ std::string getUrl(const std::string &string) const;
/*virtual*/ std::string getLabel(const std::string &url, const LLUrlLabelCallback &cb);
- /*virtual*/ std::string getIcon(const std::string &url) const;
+ /*virtual*/ std::string getIcon(const std::string &url);
};