diff options
author | Armin Weatherwax | 2009-11-30 23:38:38 +0100 |
---|---|---|
committer | Armin Weatherwax | 2009-12-01 22:59:17 +0100 |
commit | 738192c930d8857d11ccbebaf62bffb7c48a8e2e (patch) | |
tree | 5c878ce2e12b37b338866eb677464a3de3af6703 /linden/indra/newview/llfirstuse.cpp | |
parent | Fixed a little mistake in .gitignore. (diff) | |
download | meta-impy-738192c930d8857d11ccbebaf62bffb7c48a8e2e.zip meta-impy-738192c930d8857d11ccbebaf62bffb7c48a8e2e.tar.gz meta-impy-738192c930d8857d11ccbebaf62bffb7c48a8e2e.tar.bz2 meta-impy-738192c930d8857d11ccbebaf62bffb7c48a8e2e.tar.xz |
Emeralds client name tag and clothing layer protection. Needs decision about a few things - find "Imprudence FIXME" (woq) in llprimitive.cpp and llvoavatar.cpp, its commented there.
modified: linden/indra/llprimitive/llprimitive.cpp
modified: linden/indra/llprimitive/llprimitive.h
modified: linden/indra/newview/app_settings/settings.xml
modified: linden/indra/newview/llagent.cpp
modified: linden/indra/newview/llappviewer.cpp
modified: linden/indra/newview/llfirstuse.cpp
modified: linden/indra/newview/llfirstuse.h
modified: linden/indra/newview/llstartup.cpp
modified: linden/indra/newview/llvoavatar.cpp
modified: linden/indra/newview/llvoavatar.h
modified: linden/indra/newview/skins/default/xui/en-us/notifications.xml
Diffstat (limited to 'linden/indra/newview/llfirstuse.cpp')
-rw-r--r-- | linden/indra/newview/llfirstuse.cpp | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index bea9260..877e586 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp | |||
@@ -45,6 +45,8 @@ | |||
45 | #include "llappviewer.h" | 45 | #include "llappviewer.h" |
46 | #include "lltracker.h" | 46 | #include "lltracker.h" |
47 | 47 | ||
48 | #include "llvoavatar.h" | ||
49 | |||
48 | // [RLVa:KB] - Version: 1.22.11 | 50 | // [RLVa:KB] - Version: 1.22.11 |
49 | #include "llviewerwindow.h" | 51 | #include "llviewerwindow.h" |
50 | // [/RLVa:KB] | 52 | // [/RLVa:KB] |
@@ -292,3 +294,35 @@ void LLFirstUse::useMedia() | |||
292 | LLNotifications::instance().add("FirstMedia"); | 294 | LLNotifications::instance().add("FirstMedia"); |
293 | } | 295 | } |
294 | } | 296 | } |
297 | void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& response) | ||
298 | { | ||
299 | gSavedSettings.setWarning("ClientTags", FALSE); | ||
300 | |||
301 | S32 option = LLNotification::getSelectedOption(notification, response); | ||
302 | |||
303 | //LLFloaterAvatarList *avlist = LLFloaterAvatarList::sInstance; | ||
304 | |||
305 | if ( option == 0 ) | ||
306 | { | ||
307 | gSavedSettings.setBOOL("DownloadClientTags",TRUE); | ||
308 | //printchat("The tags will not be updated until you restart."); | ||
309 | //fuck that shit | ||
310 | LLVOAvatar::updateClientTags(); | ||
311 | LLVOAvatar::loadClientTags(); | ||
312 | //boom | ||
313 | //toasty | ||
314 | } | ||
315 | else if ( option == 1 ) | ||
316 | { | ||
317 | gSavedSettings.setBOOL("DownloadClientTags",FALSE); | ||
318 | } | ||
319 | } | ||
320 | // static | ||
321 | void LLFirstUse::ClientTags() | ||
322 | { | ||
323 | if (gSavedSettings.getWarning("ClientTags")) | ||
324 | { | ||
325 | LLNotifications::instance().add("QueryClientTags", LLSD(), LLSD(), callbackClientTags); | ||
326 | } | ||
327 | } | ||
328 | |||