Lirusaito c2cc398339 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate ...

Conflicts(Actually git being dumb, I already merged these, just lost history):
	indra/newview/llfloateractivespeakers.h - local
	indra/newview/lloverlaybar.cpp - local
	indra/newview/skins/default/xui/en-us/panel_prim_media_controls.xml - remote

2013-06-25 19:37:50 -04:00

..

ailist.h

Compile error fix: __value is reserved on Windows.

2013-02-13 17:20:41 +01:00

CMakeLists.txt

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llalertdialog.cpp

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llalertdialog.h

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llbutton.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llbutton.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llcallbackmap.h

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

llcheckboxctrl.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llcheckboxctrl.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llclipboard.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llclipboard.h

Imported existing code

2010-04-02 02:48:44 -03:00

llcombobox.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llcombobox.h

OS X build fix

2013-05-28 03:24:12 +02:00

llcontainerview.cpp

Add AIHTTPView, a HTTP Debug Console - press Ctrl-Shift-7

2013-06-01 16:14:32 +02:00

llcontainerview.h

Add AIHTTPView, a HTTP Debug Console - press Ctrl-Shift-7

2013-06-01 16:14:32 +02:00

llctrlselectioninterface.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llctrlselectioninterface.h

Imported existing code

2010-04-02 02:48:44 -03:00

lldraghandle.cpp

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

lldraghandle.h

Imported existing code

2010-04-02 02:48:44 -03:00

lleditmenuhandler.cpp

Sanity checks, bugfixes, crashfixes, and misc tweaks snagged from snowglobe.

2011-03-01 20:13:05 -06:00

lleditmenuhandler.h

Sanity checks, bugfixes, crashfixes, and misc tweaks snagged from snowglobe.

2011-03-01 20:13:05 -06:00

llfiltereditor.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llfiltereditor.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llfloater.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llfloater.h

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llfocusmgr.cpp

Make keyboard focus more robust under closed floaters.

2013-02-08 18:40:14 +01:00

llfocusmgr.h

Make keyboard focus more robust under closed floaters.

2013-02-08 18:40:14 +01:00

llfunctorregistry.cpp

Put in some changes along sg1.4 dev history.

2010-11-21 15:57:44 +01:00

llfunctorregistry.h

LLUI V3 (very)partial merge

2011-08-29 03:33:43 -05:00

llhtmlhelp.h

Imported existing code

2010-04-02 02:48:44 -03:00

lliconctrl.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lliconctrl.h

Imported existing code

2010-04-02 02:48:44 -03:00

llkeywords.cpp

Bug fix.

2013-06-12 14:55:46 +02:00

llkeywords.h

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

lllayoutstack.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lllayoutstack.h

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lllineeditor.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lllineeditor.h

UI cleanup.

2013-04-16 00:25:59 -05:00

lllocalcliprect.cpp

Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library.

2013-01-07 20:12:14 -06:00

lllocalcliprect.h

Finished LLGLTexture. Migrated opengl related code from llui.h/cpp to llrender2dutils.h/cpp. Moved lluiimage to llrender library.

2013-01-07 20:12:14 -06:00

llmemberlistener.h

LLViewerRegion WIP: Added all headers that are dragged in.

2012-02-18 02:22:49 +01:00

llmenugl.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llmenugl.h

Add support for CustomMenuAction Capability

2013-02-13 13:00:40 -05:00

llmodaldialog.cpp

This should at least stop crash from pathfinding notification till we have figured it out better.

2012-08-16 03:37:13 +02:00

llmodaldialog.h

This should at least stop crash from pathfinding notification till we have figured it out better.

2012-08-16 03:37:13 +02:00

llmultifloater.cpp

Fix multi-preview for textures

2012-08-30 14:03:27 +02:00

llmultifloater.h

Fix multi-preview for textures

2012-08-30 14:03:27 +02:00

llmultislider.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llmultislider.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llmultisliderctrl.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llmultisliderctrl.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llnotificationcontext.h

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llnotificationptr.h

Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places.

2011-09-03 19:30:42 -05:00

llnotifications.cpp

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llnotifications.h

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llnotificationsutil.cpp

Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places.

2011-09-03 19:30:42 -05:00

llnotificationsutil.h

Added LLNotificationsUtil and switched LLNotifications::instance().add to LLNotificationsUtil::add in a bazillion places.

2011-09-03 19:30:42 -05:00

llnotificationtemplate.h

Hooked LLTrans into LLNotification stuffs. Also, fixed [CURRENCY] showing up in several places on the buy land window.

2012-01-11 00:49:14 -06:00

llpanel.cpp

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

2013-06-23 22:36:55 -04:00

llpanel.h

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate

2013-06-23 22:36:55 -04:00

llprogressbar.cpp

Widen login/teleport progress bar. Fixed toolbar/overlaybar appearing over login progressview. Updated progressview a bit. Added drawcontext alpha support to llprogressbar. Fixed issue with prim media control panel blocking mouseclicks on upper portion of on-prim media.

2013-06-25 10:29:48 -05:00

llprogressbar.h

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

llradiogroup.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llradiogroup.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llresizebar.cpp

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

llresizebar.h

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

llresizehandle.cpp

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

llresizehandle.h

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

llresmgr.cpp

Add Pathfinding UI from v3

2013-03-08 03:17:11 -05:00

llresmgr.h

Imported existing code

2010-04-02 02:48:44 -03:00

llrootview.cpp

Further pluggged in LLView::Params. For now just used for a few exclusively hard-coded elements. XUI parsing not yet implemented. New element registry not yet implemented.

2013-05-17 14:45:23 -05:00

llrootview.h

Further pluggged in LLView::Params. For now just used for a few exclusively hard-coded elements. XUI parsing not yet implemented. New element registry not yet implemented.

2013-05-17 14:45:23 -05:00

llscrollbar.cpp

UI cleanup.

2013-04-16 00:25:59 -05:00

llscrollbar.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llscrollcontainer.cpp

Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer

2013-05-17 16:46:40 -05:00

llscrollcontainer.h

Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer

2013-05-17 16:46:40 -05:00

llscrollingpanellist.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llscrollingpanellist.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llscrolllistctrl.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llscrolllistctrl.h

Eliminated most instances of the legacy setCallbackUserData (and modernized up a bunch of callbacks)

2013-06-16 20:00:00 -04:00

llsearcheditor.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llsearcheditor.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llslider.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llslider.h

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llsliderctrl.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llsliderctrl.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llspinctrl.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llspinctrl.h

UI cleanup.

2013-04-16 00:25:59 -05:00

llstatbar.cpp

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

llstatbar.h

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

llstatgraph.cpp

Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer

2013-05-17 16:46:40 -05:00

llstatgraph.h

Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer

2013-05-17 16:46:40 -05:00

llstatview.cpp

Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer

2013-05-17 16:46:40 -05:00

llstatview.h

Migrated baser LLStat* classes and their LLContainerView dependency to llui library and renamed LLScrollableContainerView to LLScrollContainer

2013-05-17 16:46:40 -05:00

llstyle.cpp

Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.

2011-03-31 03:22:01 -05:00

llstyle.h

Some minor llfont cleanup..more to come

2013-03-07 01:41:42 -05:00

lltabcontainer.cpp

UI cleanup.

2013-04-16 00:25:59 -05:00

lltabcontainer.h

Unbork lltabcontainer's clipping. Also made vertical tab scrolling actually work (apparently it hasn't in quite some time).

2012-06-19 14:30:13 -05:00

lltextbox.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lltextbox.h

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lltexteditor.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lltexteditor.h

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

lltextparser.cpp

Don't instantiate LLTextParser::getInstance before user logged in.

2011-08-18 19:32:45 +02:00

lltextparser.h

LLTextParser now a singleton.

2011-07-31 19:09:47 -05:00

lltrans.cpp

UI cleanup.

2013-04-16 00:25:59 -05:00

lltrans.h

LLViewerRegion WIP: brought LLTrans up to speed with V3.

2012-02-18 02:22:49 +01:00

llui.cpp

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llui.h

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

lluicolor.cpp

Clean up and updates

2012-07-20 08:13:07 -04:00

lluicolor.h

Clean up and updates

2012-07-20 08:13:07 -04:00

lluiconstants.h

Imported existing code

2010-04-02 02:48:44 -03:00

lluictrl.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lluictrl.h

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lluictrlfactory.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

lluictrlfactory.h

Further pluggged in LLView::Params. For now just used for a few exclusively hard-coded elements. XUI parsing not yet implemented. New element registry not yet implemented.

2013-05-17 14:45:23 -05:00

lluifwd.h

Imported existing code

2010-04-02 02:48:44 -03:00

lluistring.cpp

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

lluistring.h

Updated LLResizeBar and LLResizeHandle to use LLView::Param based ctors.

2013-05-20 00:36:34 -05:00

lluixmltags.h

Put in some changes along sg1.4 dev history.

2010-11-21 15:57:44 +01:00

llundo.cpp

Imported existing code

2010-04-02 02:48:44 -03:00

llundo.h

Imported existing code

2010-04-02 02:48:44 -03:00

llurlaction.cpp

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llurlaction.h

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llurlentry.cpp

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llurlentry.h

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llurlmatch.cpp

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llurlmatch.h

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llurlregistry.cpp

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llurlregistry.h

Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)!

2013-05-31 05:33:41 -05:00

llview.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llview.h

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llviewborder.cpp

Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate

2013-06-23 22:36:04 -04:00

llviewborder.h

Huge renderer update (WIP). Still plenty to do, especially pertaining to UI.

2011-12-09 14:02:29 -06:00

llviewmodel.cpp

Modernized lluictrl. Added LLViewModel. Fixed focus callbacks being called excessively. Updated LLButton, and implemented boost::signals2 to replace old callback handling.

2012-03-02 16:57:33 -06:00

llviewmodel.h

Modernized lluictrl. Added LLViewModel. Fixed focus callbacks being called excessively. Updated LLButton, and implemented boost::signals2 to replace old callback handling.

2012-03-02 16:57:33 -06:00

llviewquery.cpp

Make AIList resilient against invalidating iterators.

2013-02-08 17:28:22 +01:00

llviewquery.h

Use viewList_t and child_list_t in appropriate places.

2013-02-08 17:28:21 +01:00