diff options
author | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
commit | 5ff1687542240fe9b00d4c217b764770fc369c06 (patch) | |
tree | bc5a1dbc882c19120ca00efb9914d70059cd79cb /ChangeLog.txt | |
parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
parent | Removed grid stuff from World Map (for now). (diff) | |
download | meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.zip meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.gz meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.bz2 meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.xz |
Merge branch 'gridmanager' into next
Diffstat (limited to 'ChangeLog.txt')
-rw-r--r-- | ChangeLog.txt | 208 |
1 files changed, 208 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 30ab5fb..24400ef 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,58 @@ | |||
1 | 2009-09-25 Jacek Antonelli <jacek.antonelli@gmail.com> | ||
2 | |||
3 | * Removed grid stuff from World Map (for now). | ||
4 | |||
5 | modified: linden/indra/newview/llfloaterworldmap.cpp | ||
6 | modified: linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml | ||
7 | |||
8 | |||
9 | * Hid "Start Location" from grid manager floater. Not used anyway. | ||
10 | |||
11 | modified: linden/indra/newview/skins/default/xui/en-us/floater_login.xml | ||
12 | |||
13 | |||
14 | * Made grid manager update from Imprudence site, not Meerkat. | ||
15 | |||
16 | modified: linden/indra/newview/hippoGridManager.cpp: | ||
17 | |||
18 | |||
19 | * Renamed default grid "local" -> "localhost". | ||
20 | So it matches the one downloaded from the web. | ||
21 | |||
22 | modified: linden/indra/newview/app_settings/default_grids.xml | ||
23 | |||
24 | |||
25 | * Fixed HippoGridInfo::cleanUpUri appending "/" stupidly. | ||
26 | It was appending it to an empty string, "/", "//", etc. | ||
27 | |||
28 | modified: linden/indra/newview/hippoGridManager.cpp | ||
29 | |||
30 | |||
31 | * Rearranged login screen and cleaned up XUI. | ||
32 | |||
33 | modified: linden/indra/newview/skins/default/xui/en-us/panel_login.xml | ||
34 | |||
35 | |||
36 | * Login screen fields shouldn't be set from grid (for now). | ||
37 | |||
38 | modified: linden/indra/newview/llpanellogin.cpp | ||
39 | modified: linden/indra/newview/llstartup.cpp | ||
40 | |||
41 | |||
42 | * Disabled avatar name and password fields in grid manager. | ||
43 | Temporary, until we implement a decent account manager. | ||
44 | |||
45 | modified: linden/indra/newview/floaterlogin.cpp | ||
46 | modified: linden/indra/newview/hippoGridManager.cpp | ||
47 | modified: linden/indra/newview/skins/default/xui/en-us/floater_login.xml | ||
48 | |||
49 | |||
50 | * Reverted "grid-firstname_lastname" user directories. | ||
51 | Back to "firstname_lastname", like it was without grid manager. | ||
52 | |||
53 | modified: linden/indra/llvfs/lldir.cpp | ||
54 | |||
55 | |||
1 | 2009-09-25 McCabe Maxsted <hakushakukun@gmail.com> | 56 | 2009-09-25 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 57 | ||
3 | * Removed problematic /MP flag. | 58 | * Removed problematic /MP flag. |
@@ -423,6 +478,159 @@ | |||
423 | 478 | ||
424 | 2009-09-09 Jacek Antonelli <jacek.antonelli@gmail.com> | 479 | 2009-09-09 Jacek Antonelli <jacek.antonelli@gmail.com> |
425 | 480 | ||
481 | * Updated Grid Manager from Meerkat's SVN (as of r215). | ||
482 | |||
483 | modified: linden/indra/llvfs/lldir.cpp | ||
484 | modified: linden/indra/llvfs/lldir.h | ||
485 | modified: linden/indra/newview/CMakeLists.txt | ||
486 | modified: linden/indra/newview/app_settings/default_grids.xml | ||
487 | deleted: linden/indra/newview/authentication_controller.cpp | ||
488 | deleted: linden/indra/newview/authentication_controller.h | ||
489 | deleted: linden/indra/newview/authentication_floater.cpp | ||
490 | deleted: linden/indra/newview/authentication_floater.h | ||
491 | deleted: linden/indra/newview/authentication_model.cpp | ||
492 | deleted: linden/indra/newview/authentication_model.h | ||
493 | deleted: linden/indra/newview/controllerlogin.cpp | ||
494 | deleted: linden/indra/newview/controllerlogin.h | ||
495 | deleted: linden/indra/newview/controllerpasswords.cpp | ||
496 | deleted: linden/indra/newview/controllerpasswords.h | ||
497 | modified: linden/indra/newview/floaterlogin.cpp | ||
498 | modified: linden/indra/newview/floaterlogin.h | ||
499 | modified: linden/indra/newview/hippoGridManager.cpp | ||
500 | modified: linden/indra/newview/hippoGridManager.h | ||
501 | modified: linden/indra/newview/llfloaterworldmap.cpp | ||
502 | modified: linden/indra/newview/llpanellogin.cpp | ||
503 | modified: linden/indra/newview/llprefsim.cpp | ||
504 | modified: linden/indra/newview/llstartup.cpp | ||
505 | deleted: linden/indra/newview/prefpanelpasswords.cpp | ||
506 | deleted: linden/indra/newview/prefpanelpasswords.h | ||
507 | modified: linden/indra/newview/skins/default/xui/en-us/floater_login.xml | ||
508 | |||
509 | * Small performance change from Emerald viewer in LLVLComposition. | ||
510 | |||
511 | modified: linden/indra/newview/llvlcomposition.cpp | ||
512 | |||
513 | |||
514 | * Applied BlockClickSit debug setting from Emerald to block sit click action. | ||
515 | |||
516 | modified: linden/indra/newview/app_settings/settings.xml | ||
517 | modified: linden/indra/newview/lltoolpie.cpp | ||
518 | |||
519 | |||
520 | * Fixed unhandled exception in llviewerobjectlist.cpp | ||
521 | |||
522 | modified: linden/indra/newview/llviewerobjectlist.cpp | ||
523 | |||
524 | |||
525 | 2009-09-13 McCabe Maxsted <hakushakukun@gmail.com> | ||
526 | |||
527 | * Added prev/next buttons for windlight presets, cleaned up some stuff. | ||
528 | |||
529 | modified: linden/indra/newview/llfloaterwindlight.cpp | ||
530 | modified: linden/indra/newview/llfloaterwindlight.h | ||
531 | modified: linden/indra/newview/llwindlightremotectrl.cpp | ||
532 | modified: linden/indra/newview/llwlparammanager.cpp | ||
533 | modified: linden/indra/newview/llwlparammanager.h | ||
534 | modified: linden/indra/newview/skins/default/textures/textures.xml | ||
535 | modified: linden/indra/newview/skins/default/xui/en-us/floater_windlight_options.xml | ||
536 | |||
537 | |||
538 | * Fixed World options not showing up when windlight remote expanded. | ||
539 | |||
540 | modified: linden/indra/newview/skins/default/xui/en-us/panel_windlight_remote_expanded.xml | ||
541 | |||
542 | |||
543 | * Added missing left/right arrow textures. | ||
544 | |||
545 | new file: linden/indra/newview/skins/default/textures/arrow_left.tga | ||
546 | new file: linden/indra/newview/skins/default/textures/arrow_right.tga | ||
547 | new file: linden/indra/newview/skins/silver/textures/arrow_left.tga | ||
548 | new file: linden/indra/newview/skins/silver/textures/arrow_right.tga | ||
549 | |||
550 | |||
551 | 2009-09-12 McCabe Maxsted <hakushakukun@gmail.com> | ||
552 | |||
553 | * Clarified 'show in search' in profile. | ||
554 | |||
555 | modified: linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | ||
556 | |||
557 | |||
558 | * Fixed windlight toolbar not updating windlight floater pulldown. | ||
559 | |||
560 | modified: linden/indra/newview/llfloaterwindlight.cpp | ||
561 | modified: linden/indra/newview/llwindlightremotectrl.cpp | ||
562 | modified: linden/indra/newview/llwlparammanager.cpp | ||
563 | modified: linden/indra/newview/llwlparammanager.h | ||
564 | |||
565 | |||
566 | |||
567 | * Merged in Grid Manager, etc. (thanks Armin). | ||
568 | |||
569 | modified: linden/indra/llcommon/llstring.h | ||
570 | modified: linden/indra/newview/CMakeLists.txt | ||
571 | new file: linden/indra/newview/app_settings/default_grids.xml | ||
572 | modified: linden/indra/newview/app_settings/settings.xml | ||
573 | new file: linden/indra/newview/authentication_controller.cpp | ||
574 | new file: linden/indra/newview/authentication_controller.h | ||
575 | new file: linden/indra/newview/authentication_floater.cpp | ||
576 | new file: linden/indra/newview/authentication_floater.h | ||
577 | new file: linden/indra/newview/authentication_model.cpp | ||
578 | new file: linden/indra/newview/authentication_model.h | ||
579 | new file: linden/indra/newview/controllerlogin.cpp | ||
580 | new file: linden/indra/newview/controllerlogin.h | ||
581 | new file: linden/indra/newview/controllerpasswords.cpp | ||
582 | new file: linden/indra/newview/controllerpasswords.h | ||
583 | new file: linden/indra/newview/floaterlogin.cpp | ||
584 | new file: linden/indra/newview/floaterlogin.h | ||
585 | new file: linden/indra/newview/hippoGridManager.cpp | ||
586 | new file: linden/indra/newview/hippoGridManager.h | ||
587 | new file: linden/indra/newview/hippoLimits.cpp | ||
588 | new file: linden/indra/newview/hippoLimits.h | ||
589 | new file: linden/indra/newview/hippoRestRequest.cpp | ||
590 | new file: linden/indra/newview/hippoRestRequest.h | ||
591 | new file: linden/indra/newview/hippoUpdate.cpp | ||
592 | new file: linden/indra/newview/hippoUpdate.h | ||
593 | modified: linden/indra/newview/llagent.cpp | ||
594 | modified: linden/indra/newview/llappviewer.cpp | ||
595 | modified: linden/indra/newview/llappviewer.h | ||
596 | modified: linden/indra/newview/llappviewerlinux.h | ||
597 | modified: linden/indra/newview/llcallingcard.cpp | ||
598 | modified: linden/indra/newview/llcallingcard.h | ||
599 | modified: linden/indra/newview/llchatbar.cpp | ||
600 | modified: linden/indra/newview/lldrawable.h | ||
601 | modified: linden/indra/newview/llfloaterworldmap.cpp | ||
602 | modified: linden/indra/newview/llfloaterworldmap.h | ||
603 | modified: linden/indra/newview/llinventorymodel.cpp | ||
604 | modified: linden/indra/newview/llinventorymodel.h | ||
605 | modified: linden/indra/newview/llinventoryview.cpp | ||
606 | modified: linden/indra/newview/llpanellogin.cpp | ||
607 | modified: linden/indra/newview/llpanellogin.h | ||
608 | modified: linden/indra/newview/llprogressview.cpp | ||
609 | modified: linden/indra/newview/llstartup.cpp | ||
610 | modified: linden/indra/newview/llstartup.h | ||
611 | modified: linden/indra/newview/lluserauth.cpp | ||
612 | modified: linden/indra/newview/llviewerjointattachment.h | ||
613 | modified: linden/indra/newview/llviewermenu.cpp | ||
614 | modified: linden/indra/newview/llviewermenufile.cpp | ||
615 | modified: linden/indra/newview/llviewermessage.cpp | ||
616 | modified: linden/indra/newview/llviewermessage.h | ||
617 | modified: linden/indra/newview/llviewernetwork.cpp | ||
618 | modified: linden/indra/newview/llviewernetwork.h | ||
619 | modified: linden/indra/newview/llviewerobject.h | ||
620 | modified: linden/indra/newview/llviewerwindow.cpp | ||
621 | modified: linden/indra/newview/llvoavatar.cpp | ||
622 | modified: linden/indra/newview/llwearablelist.cpp | ||
623 | modified: linden/indra/newview/llworld.cpp | ||
624 | new file: linden/indra/newview/prefpanelpasswords.cpp | ||
625 | new file: linden/indra/newview/prefpanelpasswords.h | ||
626 | modified: linden/indra/newview/skins/default/xui/en-us/alerts.xml | ||
627 | new file: linden/indra/newview/skins/default/xui/en-us/floater_login.xml | ||
628 | modified: linden/indra/newview/skins/default/xui/en-us/floater_world_map.xml | ||
629 | modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | ||
630 | modified: linden/indra/newview/skins/default/xui/en-us/panel_login.xml | ||
631 | modified: linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml | ||
632 | |||
633 | |||
426 | * Commented out Linux tarball building. | 634 | * Commented out Linux tarball building. |
427 | It's a waste of time to package after every compile. | 635 | It's a waste of time to package after every compile. |
428 | 636 | ||