| .. |
|
tests
|
DEV-39188: Removed the custom support for secondlife:///app/events and
|
2009-09-14 20:01:20 +00:00 |
|
CMakeLists.txt
|
Merged latest viewer/viewer-20 into login-api.
|
2009-09-18 15:22:25 -04:00 |
|
llbutton.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llbutton.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llcallbackmap.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llcheckboxctrl.cpp
|
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
|
2009-08-11 06:37:35 +00:00 |
|
llcheckboxctrl.h
|
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
|
2009-07-07 00:53:05 +00:00 |
|
llclipboard.cpp
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
|
2009-08-12 01:12:27 +00:00 |
|
llclipboard.h
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
|
2009-08-12 01:12:27 +00:00 |
|
llcombobox.cpp
|
merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
|
2009-09-09 04:27:06 +00:00 |
|
llcombobox.h
|
merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
|
2009-09-09 04:27:06 +00:00 |
|
llconsole.cpp
|
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
|
2009-07-06 21:58:04 +00:00 |
|
llconsole.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llcontainerview.cpp
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
llcontainerview.h
|
EXT-490 Voice device settings unsaved
|
2009-08-15 00:45:43 +00:00 |
|
llctrlselectioninterface.cpp
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
llctrlselectioninterface.h
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
lldockablefloater.cpp
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3
|
2009-09-10 03:08:54 +00:00 |
|
lldockablefloater.h
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3
|
2009-09-10 03:08:54 +00:00 |
|
lldockcontrol.cpp
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
lldockcontrol.h
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
lldraghandle.cpp
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
lldraghandle.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
lleditmenuhandler.cpp
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
lleditmenuhandler.h
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
llf32uictrl.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llf32uictrl.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llfiltereditor.cpp
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
llfiltereditor.h
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
llflatlistview.cpp
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
llflatlistview.h
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
llfloater.cpp
|
Merged latest viewer/viewer-20 into login-api.
|
2009-09-18 15:22:25 -04:00 |
|
llfloater.h
|
Merged latest viewer/viewer-20 into login-api.
|
2009-09-18 15:22:25 -04:00 |
|
llfloaterreg.cpp
|
Wrap a subset of the LLFloaterReg API with an event API
|
2009-08-14 14:40:43 -04:00 |
|
llfloaterreg.h
|
Wrap a subset of the LLFloaterReg API with an event API
|
2009-08-14 14:40:43 -04:00 |
|
llfloaterreglistener.cpp
|
Wrap LLFloaterReg::toggleInstance() as well as showInstance() and hideInstance().
|
2009-08-19 15:05:08 -04:00 |
|
llfloaterreglistener.h
|
Wrap LLFloaterReg::toggleInstance() as well as showInstance() and hideInstance().
|
2009-08-19 15:05:08 -04:00 |
|
llflyoutbutton.cpp
|
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
|
2009-08-11 06:37:35 +00:00 |
|
llflyoutbutton.h
|
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
|
2009-08-11 06:37:35 +00:00 |
|
llfocusmgr.cpp
|
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
|
2009-08-27 19:00:18 +00:00 |
|
llfocusmgr.h
|
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
|
2009-08-27 19:00:18 +00:00 |
|
llfunctorregistry.cpp
|
DEV-27646 dll linkage for login module.
|
2009-05-22 23:27:16 +00:00 |
|
llfunctorregistry.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llhandle.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
lliconctrl.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lliconctrl.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llkeywords.cpp
|
skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.
|
2009-08-28 16:51:34 +00:00 |
|
llkeywords.h
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
lllayoutstack.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lllayoutstack.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
lllazyvalue.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
lllineeditor.cpp
|
merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
|
2009-09-09 04:27:06 +00:00 |
|
lllineeditor.h
|
svn merge svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1614 https://svn.aws.productengine.com/secondlife/pe/stable-2@1618 -> viewer-2.0.0-3
|
2009-09-11 00:00:10 +00:00 |
|
lllocalcliprect.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lllocalcliprect.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llmenugl.cpp
|
merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
|
2009-09-09 04:27:06 +00:00 |
|
llmenugl.h
|
merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
|
2009-09-09 04:27:06 +00:00 |
|
llmodaldialog.cpp
|
DEV-38942 Eliminate startModal() from LLModalDialog
|
2009-08-28 08:04:26 +00:00 |
|
llmodaldialog.h
|
DEV-38942 Eliminate startModal() from LLModalDialog
|
2009-08-28 08:04:26 +00:00 |
|
llmultifloater.cpp
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
llmultifloater.h
|
svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
|
2009-08-04 01:12:59 +00:00 |
|
llmultislider.cpp
|
merge QAR-1579: texture-cleanup-1.
|
2009-07-10 22:02:26 +00:00 |
|
llmultislider.h
|
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
|
2009-08-11 06:37:35 +00:00 |
|
llmultisliderctrl.cpp
|
svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
|
2009-08-27 19:00:18 +00:00 |
|
llmultisliderctrl.h
|
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
|
2009-07-16 17:54:58 +00:00 |
|
llnotifications.cpp
|
Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups.
|
2009-07-30 19:39:08 -07:00 |
|
llnotifications.h
|
Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs some post-merge cleanup.
|
2009-08-04 15:34:34 -07:00 |
|
llnotificationslistener.cpp
|
Adding LLLoginInstance unit test.
|
2009-07-24 15:08:16 -07:00 |
|
llnotificationslistener.h
|
Adding LLLoginInstance unit test.
|
2009-07-24 15:08:16 -07:00 |
|
llpanel.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llpanel.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llprogressbar.cpp
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llprogressbar.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llradiogroup.cpp
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
llradiogroup.h
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
llresizebar.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llresizebar.h
|
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
|
2009-07-07 00:53:05 +00:00 |
|
llresizehandle.cpp
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llresizehandle.h
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
llresmgr.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llresmgr.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llrngwriter.cpp
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llrngwriter.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llscrollbar.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llscrollbar.h
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
llscrollcontainer.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llscrollcontainer.h
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
llscrollingpanellist.cpp
|
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
|
2009-08-14 21:50:02 +00:00 |
|
llscrollingpanellist.h
|
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
|
2009-08-14 21:50:02 +00:00 |
|
llscrolllistcell.cpp
|
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
|
2009-08-24 20:04:52 +00:00 |
|
llscrolllistcell.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llscrolllistcolumn.cpp
|
EXT-127: Tooltips don't disappear immediately after moving mouse out of object
|
2009-07-10 20:43:08 +00:00 |
|
llscrolllistcolumn.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llscrolllistctrl.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llscrolllistctrl.h
|
merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
|
2009-09-09 04:27:06 +00:00 |
|
llscrolllistitem.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llscrolllistitem.h
|
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
|
2009-07-27 17:56:26 +00:00 |
|
llsdparam.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llsdparam.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llsearcheditor.cpp
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
llsearcheditor.h
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
llslider.cpp
|
Merged latest viewer/viewer-20 into login-api.
|
2009-09-18 15:22:25 -04:00 |
|
llslider.h
|
svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3
|
2009-08-11 06:37:35 +00:00 |
|
llsliderctrl.cpp
|
Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
|
2009-08-27 16:25:02 -04:00 |
|
llsliderctrl.h
|
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
|
2009-07-16 17:54:58 +00:00 |
|
llspinctrl.cpp
|
skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.
|
2009-08-28 16:51:34 +00:00 |
|
llspinctrl.h
|
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
|
2009-07-27 16:50:01 +00:00 |
|
llstatbar.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llstatbar.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llstatgraph.cpp
|
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
|
2009-07-06 21:58:04 +00:00 |
|
llstatgraph.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llstatview.cpp
|
EXT-490 Voice device settings unsaved
|
2009-08-15 00:45:43 +00:00 |
|
llstatview.h
|
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
|
2009-07-07 00:53:05 +00:00 |
|
llstyle.cpp
|
Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
|
2009-09-04 12:11:27 +00:00 |
|
llstyle.h
|
Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
|
2009-09-04 12:11:27 +00:00 |
|
lltabcontainer.cpp
|
merge -r 1649-1651 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:56:28 +00:00 |
|
lltabcontainer.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltextbase.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltextbase.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltextbox.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltextbox.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltexteditor.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltexteditor.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltextparser.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
lltextparser.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
lltooltip.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltooltip.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lltransutil.cpp
|
svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6
|
2009-08-21 21:52:21 +00:00 |
|
lltransutil.h
|
svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6
|
2009-08-21 21:52:21 +00:00 |
|
llui.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llui.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lluicolortable.cpp
|
DEV-35112 Renamed colors_def.xml to colors.xml. Reviewed by Richard.
|
2009-07-09 00:59:52 +00:00 |
|
lluicolortable.h
|
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
|
2009-07-06 21:58:04 +00:00 |
|
lluiconstants.h
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
lluictrl.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lluictrl.h
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lluictrlfactory.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
lluictrlfactory.h
|
svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/linux-updater-6
|
2009-08-21 21:52:21 +00:00 |
|
lluifwd.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
lluiimage.cpp
|
merge QAR-1579: texture-cleanup-1.
|
2009-07-10 22:02:26 +00:00 |
|
lluiimage.h
|
merge QAR-1579: texture-cleanup-1.
|
2009-07-10 22:02:26 +00:00 |
|
lluistring.cpp
|
Significant optimization to LLUIString.
|
2009-08-17 16:15:53 +00:00 |
|
lluistring.h
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
llundo.cpp
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
llundo.h
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
llurlaction.cpp
|
Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
|
2009-09-04 12:11:27 +00:00 |
|
llurlaction.h
|
Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
|
2009-09-04 12:11:27 +00:00 |
|
llurlentry.cpp
|
DEV-39188: Removed the custom support for secondlife:///app/events and
|
2009-09-14 20:01:20 +00:00 |
|
llurlentry.h
|
DEV-39188: Removed the custom support for secondlife:///app/events and
|
2009-09-14 20:01:20 +00:00 |
|
llurlmatch.cpp
|
Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
|
2009-09-04 12:11:27 +00:00 |
|
llurlmatch.h
|
Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
|
2009-09-04 12:11:27 +00:00 |
|
llurlregistry.cpp
|
DEV-39188: Removed the custom support for secondlife:///app/events and
|
2009-09-14 20:01:20 +00:00 |
|
llurlregistry.h
|
Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
|
2009-09-04 12:11:27 +00:00 |
|
llview.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llview.h
|
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
|
2009-09-11 23:50:59 +00:00 |
|
llviewborder.cpp
|
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
|
2009-09-09 01:26:44 +00:00 |
|
llviewborder.h
|
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
|
2009-07-07 00:53:05 +00:00 |
|
llviewmodel.cpp
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llviewmodel.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
|
llviewquery.cpp
|
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
2009-01-08 00:05:06 +00:00 |
|
llviewquery.h
|
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
|
2009-06-21 08:04:56 +00:00 |
bb1d4592bd