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/llfirstuse.cpp | |
| 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 '')
| -rw-r--r-- | linden/indra/newview/llfirstuse.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index ee7053d..b807b17 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp | |||
| @@ -131,6 +131,17 @@ void LLFirstUse::useMap() | |||
| 131 | } | 131 | } |
| 132 | 132 | ||
| 133 | // static | 133 | // static |
| 134 | void LLFirstUse::useMiniMap() | ||
| 135 | { | ||
| 136 | if (gSavedSettings.getWarning("FirstMiniMap")) | ||
| 137 | { | ||
| 138 | gSavedSettings.setWarning("FirstMiniMap", FALSE); | ||
| 139 | |||
| 140 | LLNotifyBox::showXml("FirstMiniMap"); | ||
| 141 | } | ||
| 142 | } | ||
| 143 | |||
| 144 | // static | ||
| 134 | void LLFirstUse::useGoTo() | 145 | void LLFirstUse::useGoTo() |
| 135 | { | 146 | { |
| 136 | // nothing for now JC | 147 | // nothing for now JC |