aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gridmanager' into nextJacek Antonelli2009-09-267-13/+34
|\
| * Merge remote branch 'mccabe/1.2.0-next' into nextJacek Antonelli2009-09-265-10/+32
| |\
| | * Added missing FloaterAnimationListRect to settings.xmlMcCabe Maxsted2009-09-261-0/+16
| | |
| | * Cleaned up channel control code in llchatbar.cpp someMcCabe Maxsted2009-09-252-9/+13
| | |
| | * Temporarily disable chat channel control in chat history until it's fixedMcCabe Maxsted2009-09-253-2/+4
| | |
| * | Renamed 'Restrained Life Active' to 'Restrained Life Support'.Jacek Antonelli2009-09-261-2/+2
| | |
| * | Removed redundant warning about export perms.Jacek Antonelli2009-09-261-1/+0
| | |
* | | Removed the multiple accounts tip from grid manager.Jacek Antonelli2009-09-251-9/+1
| | |
* | | Removed 'Set Default' button from grid manager floater.Jacek Antonelli2009-09-252-5/+7
| | |
* | | Made HippoGridManager's sanitation code more sane.Jacek Antonelli2009-09-253-27/+31
| | |
* | | Moved many HippoGridManager methods defs out of the header.Jacek Antonelli2009-09-252-48/+254
| | | | | | | | | | | | | | | There's no good reason for these to be in the header, it just breaks encapsulation for no significant gain.
* | | Merge branch 'gridmanager' into nextJacek Antonelli2009-09-2550-554/+2998
|\ \ \ | |/ / |/| |
| * | Removed grid stuff from World Map (for now).Jacek Antonelli2009-09-252-214/+33
| | |
| * | Hid "Start Location" from grid manager floater. Not used anyway.Jacek Antonelli2009-09-251-2/+1
| | |
| * | Made grid manager update from Imprudence site, not Meerkat.Jacek Antonelli2009-09-251-1/+1
| | |
| * | Renamed default grid "local" -> "localhost".Jacek Antonelli2009-09-251-1/+1
| | | | | | | | | | | | So it matches the one downloaded from the web.
| * | Fixed HippoGridInfo::cleanUpUri appending "/" stupidly.Jacek Antonelli2009-09-251-2/+7
| | | | | | | | | | | | It was appending it to an empty string, "/", "//", etc.
| * | Rearranged login screen and cleaned up XUI.Jacek Antonelli2009-09-251-73/+142
| | |
| * | Login screen fields shouldn't be set from grid (for now).Jacek Antonelli2009-09-252-18/+10
| | |
| * | Disabled avatar name and password fields in grid manager.Jacek Antonelli2009-09-253-63/+68
| | | | | | | | | | | | Temporary, until we implement a decent account manager.
| * | Merge remote branch 'armin/armin-1.2.0-next' into login-managerJacek Antonelli2009-09-251-170/+170
| |\ \ | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/llinventorymodel.cpp
| | * | Fixed unhandled exception in llinventorymodel.cppArmin Weatherwax2009-09-201-0/+2
| | | |
| | * | Fixed unhandled exception in llviewerobjectlist.cppMcCabe Maxsted2009-09-201-0/+4
| | | |
| | * | Merge commit 'b3c39a47e76f595fd953d9ccffc58b0dfb8359db' into armin-1.2.0-nextArmin Weatherwax2009-09-2053-543/+3100
| | |\ \
| | * | | Henri Beauchamps $HOME as default load/save location for LinuxArmin Weatherwax2009-09-191-0/+6
| | | | | | | | | | | | | | | | | | | | modified: linden/indra/newview/llfilepicker.cpp
| * | | | Merge branch 'next' into login-managerJacek Antonelli2009-09-2394-942/+3672
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | 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 Antonelli2009-09-1023-1306/+466
| | | | |
| * | | | Fixed line endings on hippo and grid manager files.Jacek Antonelli2009-09-109-1080/+1080
| | | | |
| * | | | Merged 'armin/grid-manager5' into login-managerJacek Antonelli2009-09-1063-488/+3883
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/newview/CMakeLists.txt linden/indra/newview/llpanellogin.cpp
| | * | | | looks like working nowArmin Weatherwax2009-07-113-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 Weatherwax2009-07-117-5/+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_PRECACHEArmin Weatherwax2009-07-111-0/+1
| | | | | |
| | * | | | BROKEN logoff/relog crashing inconsistently on various startup states.Armin Weatherwax2009-07-1152-440/+3792
| | | | | |
* | | | | | Merge remote branch 'mccabe/1.2.0-next' into nextJacek Antonelli2009-09-2512-24/+165
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Fixed region names not showing up on regions with zero avatarsMcCabe Maxsted2009-09-251-2/+1
| | | | |
| * | | | Fixed Last Owner text in tools window not disablingMcCabe Maxsted2009-09-252-1/+3
| | | | |
| * | | | Clarified 'Track' button tooltip in radarMcCabe Maxsted2009-09-241-1/+1
| | | | |
| * | | | Fixed Add button being enabled for friends in the radarMcCabe Maxsted2009-09-241-0/+2
| | | | |
| * | | | Applied RLVa patch for Imprudence 1.2 by Kitty BarnettMcCabe Maxsted2009-09-245-17/+76
| | | | |
| * | | | Applied particle chat feature from Emerald viewer (tell an object it's ↵McCabe Maxsted2009-09-223-0/+79
| | | | | | | | | | | | | | | | | | | | selected on channel 9000)
| * | | | Clarifed Mini-Map menu option: 'Show Map' to 'Show World Map'McCabe Maxsted2009-09-221-1/+1
| | | | |
| * | | | Fixed RLVa issue in LLNetMap the right way (thanks Kitty)McCabe Maxsted2009-09-221-3/+3
| | | | |
* | | | | Moved "Show HUD Attachments" back to View, restored shortcut.Jacek Antonelli2009-09-231-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 nextJacek Antonelli2009-09-2393-934/+3666
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 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 Maxsted2009-09-225-12/+18
| | | | | | | | | | | | | | | | Included missing artwork
| * | | Merged 1.2.0-minimap-magnify into 1.2.0-radarzoomMcCabe Maxsted2009-09-226-29/+50
| |\ \ \
| | * | | Applied Aimee's minimap zoom patchMcCabe Maxsted2009-06-096-29/+50
| | | | |
| * | | | Fixed map textures displaying as XMcCabe Maxsted2009-09-221-1/+6
| | | | |
| * | | | Applied Jacek's patch to show number of avatars in world mapMcCabe Maxsted2009-09-222-2/+40
| | | | |
| * | | | Changed 'Presets' button to 'Sky'McCabe Maxsted2009-09-214-15/+15
| | | | |
generated by cgit v1.1 at 2025-02-05 19:03:22 +0000