diff options
| author | David Seikel | 2011-06-12 21:18:18 +1000 |
|---|---|---|
| committer | David Seikel | 2011-06-12 21:18:18 +1000 |
| commit | 5c192c92bf02910d93956068017daa2b9e4b80ba (patch) | |
| tree | 9c1bbbcfd6443e5b0df08bd212b3bd5027891e74 /linden/indra/newview/llurldispatcher.h | |
| parent | Rejig skins again. (diff) | |
| parent | Updated app_settings/default_grids.xml from our online grid list. (diff) | |
| download | meta-impy-5c192c92bf02910d93956068017daa2b9e4b80ba.zip meta-impy-5c192c92bf02910d93956068017daa2b9e4b80ba.tar.gz meta-impy-5c192c92bf02910d93956068017daa2b9e4b80ba.tar.bz2 meta-impy-5c192c92bf02910d93956068017daa2b9e4b80ba.tar.xz | |
Merge remote-tracking branch 'jacek/next' into next
Conflicts (manualy merged):
linden/indra/newview/app_settings/default_grids.xml
linden/indra/newview/primbackup.cpp
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
linden/indra/newview/skins/default/xui/en-us/notifications.xml
InWorldz specific crap removed.
Diffstat (limited to 'linden/indra/newview/llurldispatcher.h')
| -rw-r--r-- | linden/indra/newview/llurldispatcher.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llurldispatcher.h b/linden/indra/newview/llurldispatcher.h index ead1480..8a08127 100644 --- a/linden/indra/newview/llurldispatcher.h +++ b/linden/indra/newview/llurldispatcher.h | |||
| @@ -66,6 +66,8 @@ public: | |||
| 66 | 66 | ||
| 67 | static std::string buildSLURL(const std::string& regionname, S32 x, S32 y, S32 z); | 67 | static std::string buildSLURL(const std::string& regionname, S32 x, S32 y, S32 z); |
| 68 | // builds: http://slurl.com/secondlife/RegionName/x/y/z/ | 68 | // builds: http://slurl.com/secondlife/RegionName/x/y/z/ |
| 69 | |||
| 70 | static std::string createGroupJoinLink(const LLUUID& group_id); | ||
| 69 | }; | 71 | }; |
| 70 | 72 | ||
| 71 | #endif | 73 | #endif |