Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gridmanager' into next | Jacek Antonelli | 2009-09-25 | 54 | -558/+3219 |
|\ | |||||
| * | Removed grid stuff from World Map (for now). | Jacek Antonelli | 2009-09-25 | 3 | -214/+39 |
| | | |||||
| * | Hid "Start Location" from grid manager floater. Not used anyway. | Jacek Antonelli | 2009-09-25 | 2 | -2/+6 |
| | | |||||
| * | Made grid manager update from Imprudence site, not Meerkat. | Jacek Antonelli | 2009-09-25 | 2 | -1/+6 |
| | | |||||
| * | Renamed default grid "local" -> "localhost". | Jacek Antonelli | 2009-09-25 | 2 | -1/+7 |
| | | | | | | | | So it matches the one downloaded from the web. | ||||
| * | Fixed HippoGridInfo::cleanUpUri appending "/" stupidly. | Jacek Antonelli | 2009-09-25 | 2 | -2/+13 |
| | | | | | | | | It was appending it to an empty string, "/", "//", etc. | ||||
| * | Rearranged login screen and cleaned up XUI. | Jacek Antonelli | 2009-09-25 | 2 | -73/+147 |
| | | |||||
| * | Login screen fields shouldn't be set from grid (for now). | Jacek Antonelli | 2009-09-25 | 3 | -18/+16 |
| | | |||||
| * | Disabled avatar name and password fields in grid manager. | Jacek Antonelli | 2009-09-25 | 4 | -63/+76 |
| | | | | | | | | Temporary, until we implement a decent account manager. | ||||
| * | Reverted "grid-firstname_lastname" user directories. | Jacek Antonelli | 2009-09-25 | 2 | -8/+16 |
| | | | | | | | | Back to "firstname_lastname", like it was without grid manager. | ||||
| * | Merge remote branch 'armin/armin-1.2.0-next' into login-manager | Jacek Antonelli | 2009-09-25 | 2 | -170/+226 |
| |\ | | | | | | | | | | | | | Conflicts: linden/indra/newview/llinventorymodel.cpp | ||||
| | * | Fixed unhandled exception in llinventorymodel.cpp | Armin Weatherwax | 2009-09-20 | 1 | -0/+2 |
| | | | |||||
| | * | Fixed unhandled exception in llviewerobjectlist.cpp | McCabe Maxsted | 2009-09-20 | 2 | -0/+60 |
| | | | |||||
| | * | Merge commit 'b3c39a47e76f595fd953d9ccffc58b0dfb8359db' into armin-1.2.0-next | Armin Weatherwax | 2009-09-20 | 57 | -547/+3218 |
| | |\ | |||||
| | * | | Henri Beauchamps $HOME as default load/save location for Linux | Armin Weatherwax | 2009-09-19 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | modified: linden/indra/newview/llfilepicker.cpp | ||||
| * | | | Merge branch 'next' into login-manager | Jacek Antonelli | 2009-09-23 | 116 | -1028/+4393 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | Conflicts: linden/indra/newview/llinventorymodel.cpp linden/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml | ||||
| * | | | Updated Grid Manager from Meerkat's SVN (as of r215). | Jacek Antonelli | 2009-09-10 | 26 | -1310/+508 |
| | | | | |||||
| * | | | Fixed line endings on hippo and grid manager files. | Jacek Antonelli | 2009-09-10 | 9 | -1080/+1080 |
| | | | | |||||
| * | | | Merged 'armin/grid-manager5' into login-manager | Jacek Antonelli | 2009-09-10 | 65 | -488/+3951 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/CMakeLists.txt linden/indra/newview/llpanellogin.cpp | ||||
| | * | | | looks like working now | Armin Weatherwax | 2009-07-11 | 3 | -41/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: linden/indra/newview/llchatbar.cpp modified: linden/indra/newview/llviewerwindow.cpp modified: linden/indra/newview/llvoavatar.cpp | ||||
| | * | | | Broken: relog sometimes works once; fixed inventory and avatar not ruthed ↵ | Armin Weatherwax | 2009-07-11 | 14 | -9791/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anymore. deleted: Imprudence.log modified: linden/indra/newview/llagent.cpp modified: linden/indra/newview/llappviewer.cpp modified: linden/indra/newview/llinventorymodel.cpp modified: linden/indra/newview/llinventorymodel.h modified: linden/indra/newview/llinventoryview.cpp modified: linden/indra/newview/llviewerjointattachment.h modified: linden/indra/newview/llviewermenu.cpp deleted: mAttachedObject.diff.txt deleted: meerkat-llmenugl.diff.txt deleted: meerkat-message.diff.txt deleted: meerkat-pipeline.cpp.diff.txt deleted: meerkat-voice.diff.txt deleted: stack_trace.log | ||||
| | * | | | BROKEN now consistantly crashes at startup STATE_PRECACHE | Armin Weatherwax | 2009-07-11 | 8 | -0/+9787 |
| | | | | | |||||
| | * | | | BROKEN logoff/relog crashing inconsistently on various startup states. | Armin Weatherwax | 2009-07-11 | 53 | -440/+3793 |
| | | | | | |||||
| | * | | | Updated URL for Mac OpenAL libs package. | Jacek Antonelli | 2009-07-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge remote branch 'mccabe/1.2.0-next' into next | Jacek Antonelli | 2009-09-25 | 16 | -58/+248 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Fixed region names not showing up on regions with zero avatars | McCabe Maxsted | 2009-09-25 | 2 | -2/+6 |
| | | | | | |||||
| * | | | | Fixed Windows using wrong GStreamer library names | McCabe Maxsted | 2009-09-25 | 2 | -17/+22 |
| | | | | | |||||
| * | | | | Removed problematic /MP flag | McCabe Maxsted | 2009-09-25 | 2 | -16/+14 |
| | | | | | |||||
| * | | | | Fixed minor typo in develop.py | McCabe Maxsted | 2009-09-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed Last Owner text in tools window not disabling | McCabe Maxsted | 2009-09-25 | 3 | -1/+9 |
| | | | | | |||||
| * | | | | Clarified 'Track' button tooltip in radar | McCabe Maxsted | 2009-09-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fixed Add button being enabled for friends in the radar | McCabe Maxsted | 2009-09-24 | 2 | -0/+7 |
| | | | | | |||||
| * | | | | Applied RLVa patch for Imprudence 1.2 by Kitty Barnett | McCabe Maxsted | 2009-09-24 | 6 | -17/+87 |
| | | | | | |||||
| * | | | | Applied particle chat feature from Emerald viewer (tell an object it's ↵ | McCabe Maxsted | 2009-09-22 | 4 | -0/+86 |
| | | | | | | | | | | | | | | | | | | | | selected on channel 9000) | ||||
| * | | | | Clarifed Mini-Map menu option: 'Show Map' to 'Show World Map' | McCabe Maxsted | 2009-09-22 | 2 | -1/+6 |
| | | | | | |||||
| * | | | | Fixed RLVa issue in LLNetMap the right way (thanks Kitty) | McCabe Maxsted | 2009-09-22 | 2 | -3/+10 |
| | | | | | |||||
* | | | | | Moved "Show HUD Attachments" back to View, restored shortcut. | Jacek Antonelli | 2009-09-23 | 2 | -7/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts earlier change (Jan 27) which moved it to Advanced menu. This reverts commit e43ad0a92e04eb2fd55f42f983e9d7495df90ae9. Conflicts: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | ||||
* | | | | | Merge remote branch 'mccabe/1.2.0-next' into next | Jacek Antonelli | 2009-09-23 | 115 | -1020/+4379 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | Display selected avatars larger than normal, zoom in at a reasonable speed. ↵ | McCabe Maxsted | 2009-09-22 | 6 | -12/+27 |
| | | | | | | | | | | | | | | | | Included missing artwork | ||||
| * | | | Merged 1.2.0-minimap-magnify into 1.2.0-radarzoom | McCabe Maxsted | 2009-09-22 | 8 | -29/+62 |
| |\ \ \ | |||||
| | * | | | Applied Aimee's minimap zoom patch | McCabe Maxsted | 2009-06-09 | 8 | -29/+62 |
| | | | | | |||||
| * | | | | Fixed map textures displaying as X | McCabe Maxsted | 2009-09-22 | 2 | -2/+12 |
| | | | | | |||||
| * | | | | Applied Jacek's patch to show number of avatars in world map | McCabe Maxsted | 2009-09-22 | 3 | -2/+46 |
| | | | | | |||||
| * | | | | Changed 'Presets' button to 'Sky' | McCabe Maxsted | 2009-09-21 | 5 | -15/+25 |
| | | | | | |||||
| * | | | | Fixed unhandled exception in llinventorymodel.cpp | Armin Weatherwax | 2009-09-21 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Henri Beauchamps $HOME as default load/save location for Linux | Armin Weatherwax | 2009-09-21 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | modified: linden/indra/newview/llfilepicker.cpp | ||||
| * | | | | Merged 1.2.0-radar2 into 1.2.0-next | McCabe Maxsted | 2009-09-21 | 15 | -22/+925 |
| |\ \ \ \ | |||||
| | * | | | | Estate and track buttons now disable when they should, tweaked spacing | McCabe Maxsted | 2009-09-16 | 4 | -47/+94 |
| | | | | | | |||||
| | * | | | | Moved Rotate Mini-Map option to mini-map menu, added first use dialog | McCabe Maxsted | 2009-09-16 | 11 | -6/+84 |
| | | | | | | |||||
| | * | | | | Fixed min minimap size | McCabe Maxsted | 2009-09-16 | 1 | -1/+1 |
| | | | | | |