summaryrefslogtreecommitdiff
path: root/indra/newview/llsidetray.h
AgeCommit message (Collapse)Author
2009-11-11Manual merge.Vadim Savchuk
Resolved conflicts in panel_bottomtray.xml and llavataractions.cpp. --HG-- branch : product-engine
2009-11-11Fixed low bug EXT-1499 (Finalize the Home panel and add tooltips to the tab ↵Andrew Dyukov
grabs). --HG-- branch : product-engine
2009-11-10Merge changes from product-engineSteve Bennetts
2009-11-10mergeYuri Chebotarev
--HG-- branch : product-engine
2009-11-09renamed LLLayoutStack::idle to LLLayoutStack::updateClassrichard
converted mWorldViewPlaceholder to a LLHandle<LLView> improved layout of panel_bottomtray reviewed by James
2009-11-09data driven layout of top-level UI elementsrichard
EXT-1219 Side tray slide-out animation cleaned up some layout of bottom tray contents reviewed by James
2009-10-23EXT-968 Side tray buttons have "selected" appearance when each tab is selected.James Cook
Changed mTabs to hold LLSideTrayTab* so we don't have to dynamic_cast<> everywhere Reviewed with Leyla.
2009-10-22EXT-287 Side tray open/close arrows are now an image, not the text "<<" and ">>"James Cook
Removed some dead code from LLSideTray Next step is to merge all the tab art with overlay art and use button selected images to show a "pressed" state for all buttons. Reviewed with Angela.
2009-10-22Moved internal LLSideTrayTab class to .cpp file, de-inline param block ↵James Cook
constructor, not reviewed
2009-10-19Merging revisions 2046-2068 of ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry * Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231 * Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476 * IM changes
2009-08-28svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3 * EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
2009-08-12merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0 Fixes: EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412 Other changes: Movement & Caemra controls work Profile and Me panel refactoring Notification refactoring
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-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ↵James Cook
for now, not complete. Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-21merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r ↵Steven Bennetts
1078-1091 -> viewer-2.0.0-3
2009-07-09Missed a fileSteven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 01:33:33 +0000