summaryrefslogtreecommitdiff
path: root/indra/newview/lllocationhistory.cpp
AgeCommit message (Collapse)Author
2009-08-07Command: Merging from ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra, revision 1245 to https://svn.aws.productengine.com/secondlife/pe/stable-1/indra, revision 1246 into P:\svn\viewer-2-0\latest\indra, ignoring ancestry * EXT-277 - Modifications to the Location Bar Context Menu * EXT-252 - /whisper, /shout * EXT-254 - IM chiclet counter * EXT-267 - 'Status' drop-down menu doesn't drop in the Side tray / Me panel * EXT-298 - Update Places Panel Spec to reflect latest Create Landmark format * EXT-278 - Input Field History should display human readable names * EXT-317 - Avatar profile isn't opened in the sidetray as Profile Info panel when selecting an avatar in the search * Changes to notification tips * Changes to movement and camera controls * Side Tray functionality additions and code cleanup
2009-08-03merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3 QA: New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing. Many other changes to the bottom bar. Changes to local chat behavior.
2009-07-30merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
2009-07-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-15Revert rev 126736 for DEV-35109 which made location history in nav bar show ↵James Cook
all teleports instead of only those typed. viewer-2 now meets current spec, but spec is under discussion and Product Engine may be asked to reimplement something different. Merging revisions 126736-126735 of svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-14Merge skinning-15 to viewer-2. Fixes include:James Cook
DEV-35175 Spawning context menu should not move mouse cursor (Note: introduces regression where menu can fall off bottom of screen, will fix shortly) DEV-35143 Modal alerts appear behind side tray DEV-35141 Landmarks image and description outside of landmarks Merging revisions 126418-126419,126726-126727,126856-126857,127010-127011,127014-127016 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-15 into G:\viewer-2.0.0-3, respecting ancestry
2009-07-10Fix Linux build error due to F32/S32 conversion warning. Not reviewed.James Cook
2009-07-09svn merge -r126726:126727 ↵Leyla Farazha
svn+ssh://svn.lindenlab.com/linden/branches/skinning/skinning-15/ DEV-35109 Nav bar does not record teleports taken by any method other than typing into nav bar DEV-35117 Hard to open local chat, needs bottom bar widget for now hiding test IM floaters
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch