summaryrefslogtreecommitdiff
path: root/indra/newview/llsidetray.cpp
AgeCommit message (Expand)Author
2009-08-13More merge fixes (side panel merge issue)Steven Bennetts
2009-08-12merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https:...Steven Bennetts
2009-08-11svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3Steven Bennetts
2009-08-03merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-07-30merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ...James Cook
2009-07-21merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-...Steven Bennetts
2009-07-21merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-09Fixed LLPanel visible and enabled settings.Steven Bennetts
2009-07-08merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> v...Steven Bennetts
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
2009-07-02merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts