Aleric Inglewood 536cb6febd Merge branch 'curlthreading2' into curlthreading3 ...

Conflicts:
	indra/CMakeLists.txt
	indra/llcommon/llstring.h
	indra/llmessage/CMakeLists.txt
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp

2012-08-15 00:51:40 +02:00

..

CMakeLists.txt

Merge branch 'curlthreading2' into curlthreading3

2012-08-15 00:51:40 +02:00

llalertdialog.cpp

LLFrameTimer review and resulting changes.

2011-08-18 19:30:43 +02:00

llalertdialog.h

Imported existing code

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

llbutton.cpp

Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.

2012-06-15 09:51:11 -05: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

scroll-list column headers now work on single-click. Also improved focus handling for scroll-lists.

2012-03-05 18:30:36 -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

lldelayeduidelete.cpp

It builds, now time to work on runtime bullcrap!

2010-04-23 08:31:39 -03:00

lldelayeduidelete.h

Fixed compile errors for gcc4.7 (also reported by clang)

2012-04-28 21:29:52 -04: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

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

2012-03-28 22:27:45 +02:00

llfloater.h

Fix Issue 304: export texture in png too

2012-08-08 10:50:17 -04:00

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

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

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

llhandle.h

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

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

Updated LLView:

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

lllineeditor.h

Updated LLView:

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

lllocalcliprect.cpp

new fasttimers, including ui.

2012-01-23 18:30:54 -06:00

lllocalcliprect.h

new fasttimers, including ui.

2012-01-23 18:30:54 -06:00

llmemberlistener.h

LLViewerRegion WIP: Added all headers that are dragged in.

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

llmenugl.cpp

scroll-list column headers now work on single-click. Also improved focus handling for scroll-lists.

2012-03-05 18:30:36 -06:00

llmenugl.h

scroll-list column headers now work on single-click. Also improved focus handling for scroll-lists.

2012-03-05 18:30:36 -06:00

llmodaldialog.cpp

Converted frequently occuring setting lookups to LLCachedControl

2010-10-07 21:36:13 -05:00

llmodaldialog.h

Imported existing code

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

llmultifloater.cpp

Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.

2012-06-15 09:51:11 -05:00

llmultifloater.h

Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.

2012-06-15 09:51:11 -05: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

RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.

2012-04-12 10:29:45 -05:00

llnotifications.h

RLVa impl updated to that used in v3. Hooked RLVa restrictions back into wearables. New RLVa floater: 'Locks...' Also updated 'Restrictions...' floater.

2012-04-12 10:29:45 -05: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

Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.

2012-06-15 09:51:11 -05:00

llpanel.h

Inital full retooling of appearance editor for multi-wearables. Also updated LLTabContainer to use standard commit and validate callback signals.

2012-06-15 09:51:11 -05:00

llprogressbar.cpp

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

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

Just fixed this file up a bit to look a bit nicer... Won't affect performance.

2012-01-06 11:18:31 -05:00

llradiogroup.h

Imported existing code

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

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

llresizebar.h

Imported existing code

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

Very, very very very very old bug from 2006, REGRESSION! Patch prevent console spam about failed locales set on systems where global locale is reported by "modern" way, I do not remember author, probably Tofu L. then others, not the better way (better is rewrite all this and fire such code OUT of loop!)

2011-07-19 22:25:50 -07: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

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

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

Fixeds and ToDones

2012-08-05 20:40:02 -04:00

llscrolllistctrl.h

Fixeds and ToDones

2012-08-05 20:40:02 -04:00

llslider.cpp

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

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

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

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

lltabcontainer.cpp

De-uglify graphics preferences

2012-08-12 20:52:57 +02: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

lltabcontainervertical.cpp

Imported existing code

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

lltabcontainervertical.h

Imported existing code

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

UI polish (scrollbar focus, tearoff menus), plus drag and drop fix.

2012-03-04 23:15:53 -06: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

Merge branch 'master' of git://github.com/siana/SingularityViewer.git into V2MultiWear

2012-02-24 13:21:59 -06:00

lltrans.h

LLViewerRegion WIP: brought LLTrans up to speed with V3.

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

llui.cpp

Manually vectorized some of the UI vertex operations.

2012-08-03 13:12:02 -05:00

llui.h

new fasttimers, including ui.

2012-01-23 18:30:54 -06: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

Added extra callback registering methods to LLUICtrl

2012-05-16 23:22:57 -05:00

lluictrl.h

Added extra callback registering methods to LLUICtrl

2012-05-16 23:22:57 -05:00

lluictrlfactory.cpp

Minor llxmlnode updated. Tracks line numbers and ostream format is a bit nicer.

2012-06-15 09:52:35 -05:00

lluictrlfactory.h

Avoid re-issuing LLPanel::postBuild() needlessly. Essential to avoid callbacks being double-registered to ui element signals (eg, LLOverlayBar::toggleMusicPlay was being called twice per click).

2012-04-24 03:11:10 -05:00

lluifwd.h

Imported existing code

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

lluiimage.cpp

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

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

lluiimage.h

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

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

Implemented a hash-map for first-level children of ui elements. First-level child lookups are prolificly abused on a per-frame basis, and a plain old loop with a string comparison each iteraton was somewhat of a hotspot. (The recursive loop after is even more expensive, however)

2012-08-03 13:20:26 -05:00

llview.h

Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer

2012-08-09 03:46:03 +02: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

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

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

llviewquery.h

LLUI V3 (very)partial merge

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