phoenix-firestorm/indra/llui
Kent Quirk 667ca55bad svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
..
CMakeLists.txt svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llbutton.cpp svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
llbutton.h QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
llcallbackmap.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcheckboxctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llcheckboxctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llclipboard.cpp merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llclipboard.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llcombobox.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llcombobox.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llctrlselectioninterface.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llctrlselectioninterface.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldraghandle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lldraghandle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lleditmenuhandler.cpp merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
lleditmenuhandler.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llfloater.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llfloater.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llfocusmgr.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfocusmgr.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llfunctorregistry.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llfunctorregistry.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
lliconctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lliconctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llkeywords.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llkeywords.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lllineeditor.cpp QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
lllineeditor.h QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
llmenugl.cpp QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
llmenugl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmodaldialog.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmodaldialog.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmultislider.cpp QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
llmultislider.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmultisliderctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llmultisliderctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llnotifications.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llnotifications.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llpanel.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llpanel.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llprogressbar.cpp svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
llprogressbar.h svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
llradiogroup.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llradiogroup.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresizebar.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresizebar.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresizehandle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresizehandle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresmgr.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llresmgr.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollbar.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llscrollbar.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llscrollcontainer.cpp QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
llscrollcontainer.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollingpanellist.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrollingpanellist.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llscrolllistctrl.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llscrolllistctrl.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llslider.cpp QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
llslider.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llsliderctrl.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llsliderctrl.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llspinctrl.cpp merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llspinctrl.h merge support-featurettes-snapshot-merge-2 for QAR-754, includes: 2008-07-18 17:50:25 +00:00
llstyle.cpp QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llstyle.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltabcontainer.cpp QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lltabcontainer.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
lltextbox.cpp svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
lltextbox.h svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
lltexteditor.cpp QAR-1142 merging 1.22 RC0-RC4 changes. 2008-12-23 19:39:58 +00:00
lltexteditor.h svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge 2008-12-15 21:21:19 +00:00
llui.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llui.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
lluiconstants.h Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
lluictrl.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
lluictrl.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
lluictrlfactory.cpp QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge 2008-11-19 23:26:29 +00:00
lluictrlfactory.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
lluifwd.h Updated header comments with our public license statement that reflects their public nature. DEV-10766 2008-02-21 21:25:17 +00:00
lluistring.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
lluistring.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llundo.cpp merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llundo.h merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release. 2008-02-19 21:42:32 +00:00
llview.cpp svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llview.h svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. 2009-01-05 18:59:12 +00:00
llviewborder.cpp QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
llviewborder.h QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 2008-06-26 00:39:00 +00:00
llviewquery.cpp merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00
llviewquery.h merge release@83343 skinning-1-merge@83714 -> release 2008-04-01 17:45:04 +00:00