diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llworldmap.h | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llworldmap.h')
| -rw-r--r-- | indra/newview/llworldmap.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h index bb3c97cfd9..1db081c74a 100644 --- a/indra/newview/llworldmap.h +++ b/indra/newview/llworldmap.h @@ -36,13 +36,15 @@ #include <map> #include <string> #include <vector> +#include <boost/function.hpp> #include "v3math.h" #include "v3dmath.h" #include "llframetimer.h" #include "llmapimagetype.h" #include "lluuid.h" -#include "llmemory.h" +#include "llpointer.h" +#include "llsingleton.h" #include "llviewerimage.h" #include "lleventinfo.h" #include "v3color.h" @@ -114,7 +116,8 @@ struct LLWorldMapLayer class LLWorldMap : public LLSingleton<LLWorldMap> { public: - typedef void(*url_callback_t)(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport); + typedef boost::function<void(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)> + url_callback_t; LLWorldMap(); ~LLWorldMap(); |