diff options
| author | Richard Linden <none@none> | 2010-06-03 14:37:02 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-06-03 14:37:02 -0700 |
| commit | fbf72790169e979908ec206e6cb705dcc41ad97f (patch) | |
| tree | d9bbee69e806a5c89316a7c1fee484bd6c67f171 /indra/llui/llurlmatch.h | |
| parent | f79ac664dd6eead75368ced40110b6f0474aa92e (diff) | |
merge fixes
Diffstat (limited to 'indra/llui/llurlmatch.h')
| -rw-r--r-- | indra/llui/llurlmatch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llurlmatch.h b/indra/llui/llurlmatch.h index 458a27d01f..1ffac6ea0f 100644 --- a/indra/llui/llurlmatch.h +++ b/indra/llui/llurlmatch.h @@ -86,7 +86,7 @@ public: /// Change the contents of this match object (used by LLUrlRegistry) void setValues(U32 start, U32 end, const std::string &url, const std::string &label, const std::string &tooltip, const std::string &icon, - const LLUIColor& color, const std::string &menu, + const LLStyle::Params& style, const std::string &menu, const std::string &location, const LLUUID& id); const LLUUID& getID() const { return mID; } |