Drake Arconis 0eeddb0607 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer into Cupcake ...

Conflicts:
	indra/newview/llappviewer.cpp

2013-03-20 08:31:04 -04:00

..

ailist.h

Compile error fix: __value is reserved on Windows.

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

CMakeLists.txt

CMake cleanup and organization

2013-03-05 12:24:51 -05:00

llalertdialog.cpp

Fix recursive call to LLNotifications::initSingleton

2013-03-19 19:56:20 +01:00

llalertdialog.h

Imported existing code

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

llbutton.cpp

Fix voice icon in chat floater tab

2012-08-13 01:56:35 +02:00

llbutton.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

llcallbackmap.h

Imported existing code

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

llcheckboxctrl.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

llcheckboxctrl.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

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

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

llcombobox.h

Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there.

2012-02-18 01:58:02 -06: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

llfloater.cpp

General cleanup of unused variable warnings

2013-03-04 16:04:05 -05:00

llfloater.h

Update to LLTombstone/LLHandle/LLRootHandle/LLHandleProvider.

2012-11-13 17:55:52 -06: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

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

lliconctrl.h

Imported existing code

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

llkeywords.cpp

Fixed up Keywords

2012-06-24 01:52:56 -04:00

llkeywords.h

Fixed up Keywords

2012-06-24 01:52:56 -04:00

lllineeditor.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

lllineeditor.h

Updated LLView:

2012-02-21 21:59:22 -06: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

Correctly position custom dropdown menus

2013-02-13 14:17:34 -05: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

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

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

llmultislider.h

LLUI V3 (very)partial merge

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

llmultisliderctrl.cpp

Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there.

2012-02-18 01:58:02 -06:00

llmultisliderctrl.h

Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there.

2012-02-18 01:58:02 -06: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

Fix recursive call to LLNotifications::initSingleton

2013-03-19 19:56:20 +01:00

llnotifications.h

Fix recursive call to LLNotifications::initSingleton

2013-03-19 19:56:20 +01: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

General cleanup of unused variable warnings

2013-03-04 16:04:05 -05:00

llpanel.h

Updates to LLScrollListCtrl and related inter-dependencies. Also added ability to set face texture to 'None' (LLUUID::null).

2012-12-08 00:56:58 -06:00

llprogressbar.cpp

General cleanup of unused variable warnings

2013-03-04 16:04:05 -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

Warn more clearly about LLRadioGroup::setValue being used wrong, and attempt to recover with LLUICtrl::setValue.

2013-01-11 18:21:48 -05:00

llradiogroup.h

Imported existing code

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

llresizebar.cpp

Fixup scroll list column header resizing.

2012-12-18 18:27:59 -06:00

llresizebar.h

Fixup scroll list column header resizing.

2012-12-18 18:27:59 -06:00

llresizehandle.cpp

Context menu appears for text-entry boxes. Temp workaround for shutdown crash. Removed extra 'Wear' entry from inventory context menu. Fixed separators not appearing in inventory context menu. mouse_opaque actually 'blocks' mouse events on occluded ui elements.

2012-03-02 23:30:57 -06:00

llresizehandle.h

Imported existing code

2010-04-02 02:48:44 -03: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

Imported existing code

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

llrootview.h

Imported existing code

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

llscrollbar.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

llscrollbar.h

Fixed up inventory filter. Basic folders now have an 'open' icon. Tweaked the indent size for inventory (looks a little nicer imo)

2012-02-27 02:53:12 -06:00

llscrollcontainer.cpp

Bug fix for scrolling folder views.

2013-02-11 03:36:46 +01:00

llscrollcontainer.h

Bug fix for scrolling folder views.

2013-02-11 03:36:46 +01:00

llscrollingpanellist.cpp

Updated LLView:

2012-02-21 21:59:22 -06:00

llscrollingpanellist.h

Intermediate step in refactoring appearance panel

2012-06-02 17:32:19 -05:00

llscrolllistctrl.cpp

Updated gesture floater to use more modern (and actual working) method of adding list elements via xml.

2013-01-14 18:41:48 -06:00

llscrolllistctrl.h

Fix for friends list not resorting upon avatar online status change. Also did some minor cleanup

2012-12-09 17:05:54 -06:00

llslider.cpp

General cleanup of unused variable warnings

2013-03-04 16:04:05 -05:00

llslider.h

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

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

llsliderctrl.cpp

Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there.

2012-02-18 01:58:02 -06:00

llsliderctrl.h

Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there.

2012-02-18 01:58:02 -06:00

llspinctrl.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

llspinctrl.h

Updated LLFocusMgr to use boost::signals2 instead of vanilla function pointers. Also removed top-focus handling from lluictrl because it doesn't belong there.

2012-02-18 01:58:02 -06: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

Removal of the deprecated lltabcontainervertical.

2013-01-22 01:38:25 -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

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

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

lltextbox.h

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

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

lltexteditor.cpp

Some minor llfont cleanup..more to come

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

lltexteditor.h

Spell check added

2011-04-23 18:08:59 -04: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

Fast Timers brought up to linden equiv

2012-09-14 00:30:52 -04:00

lltrans.h

LLViewerRegion WIP: brought LLTrans up to speed with V3.

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

llui.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

llui.h

General cleanup of unused variable warnings

2013-03-04 16:04:05 -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

Use viewList_t and child_list_t in appropriate places.

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

lluictrl.h

Remove dead code from llfloaterworldmap, and a tweak to lluictrl that I could've sworn I already did.

2012-12-16 13:30:29 -06:00

lluictrlfactory.cpp

XML-Driven floater feature (and documentation)

2013-01-30 14:07:59 -05:00

lluictrlfactory.h

XML-Driven floater feature (and documentation)

2013-01-30 14:07:59 -05:00

lluifwd.h

Imported existing code

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

lluistring.cpp

Fix underlinkage of libmedia_plugin_webkit.so

2011-05-02 23:13:15 +02:00

lluistring.h

Fix underlinkage of libmedia_plugin_webkit.so

2011-05-02 23:13:15 +02: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

llview.cpp

Remove dead code

2013-03-05 09:08:47 -05:00

llview.h

Wrap LLView::child_list_t in a class AIList.

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

llviewborder.cpp

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

2011-12-09 14:02:29 -06: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