Shyotl 36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing ...

Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp

2011-09-09 16:53:12 -05:00

..

CMakeLists.txt

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

2011-09-03 19:30:42 -05: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

Imported existing code

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

llbutton.h

Added checkboxes to groups list for visibility, groupchat, and notices...

2011-06-23 03:56:09 -05:00

llcallbackmap.h

Imported existing code

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

llcheckboxctrl.cpp

Imported existing code

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

llcheckboxctrl.h

Imported existing code

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

More login panel changes

2011-06-17 00:43:53 +02:00

llcombobox.h

More login panel changes

2011-06-17 00:43:53 +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

lldelayeduidelete.cpp

It builds, now time to work on runtime bullcrap!

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

lldelayeduidelete.h

Pulled LLEventTimer out of lltimer.h/cpp and into lleventtimer.h/cpp

2011-05-15 22:40:59 -05:00

lldraghandle.cpp

Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.

2011-07-17 19:59:30 -05: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

Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.

2011-07-17 19:59:30 -05:00

llfloater.h

Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future

2011-07-21 00:20:06 +02:00

llfocusmgr.cpp

Imported existing code

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

llfocusmgr.h

Imported existing code

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

two_sided_delimiter workaround (Broken comment blocks in LSL '/*comment*/') Didn't want to mess with the token class for one single case. This fix is pretty straight-forward and self-contained.

2011-06-25 00:28:28 -05:00

llkeywords.h

Imported existing code

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

lllineeditor.cpp

LLFrameTimer review and resulting changes.

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

lllineeditor.h

Vectorized llvolumeface while maintining strided vertexbuffers.

2011-07-22 04:29:19 -05:00

llmemberlistener.h

Fix underlinkage of libmedia_plugin_webkit.so

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

llmenugl.cpp

LLUI V3 (very)partial merge

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

llmenugl.h

Spell check added

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

llmultislider.cpp

LLUI V3 (very)partial merge

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

llmultislider.h

LLUI V3 (very)partial merge

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

llmultisliderctrl.cpp

LLUI V3 (very)partial merge

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

llmultisliderctrl.h

LLUI V3 (very)partial merge

2011-08-29 03:33:43 -05: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

Trying out new LLCachedControl implementation.

2011-07-16 23:36:56 -05:00

llnotifications.h

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

2011-09-03 19:30:42 -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

llpanel.cpp

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

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

llpanel.h

Port to boost::signals2

2011-06-09 15:25:03 +02:00

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

llprogressbar.h

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

llradiogroup.cpp

Imported existing code

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

llradiogroup.h

Imported existing code

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

llresizebar.cpp

Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.

2011-07-17 19:59:30 -05:00

llresizebar.h

Imported existing code

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

llresizehandle.cpp

Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.

2011-07-17 19:59:30 -05: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

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

llscrollbar.h

Imported existing code

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

llscrollcontainer.cpp

Imported existing code

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

llscrollcontainer.h

Imported existing code

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

llscrollingpanellist.cpp

Imported existing code

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

llscrollingpanellist.h

Imported existing code

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

llscrolllistctrl.cpp

Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.

2011-07-17 19:59:30 -05:00

llscrolllistctrl.h

Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.

2011-07-17 19:59:30 -05:00

llslider.cpp

LLUI V3 (very)partial merge

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

llslider.h

LLUI V3 (very)partial merge

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

llsliderctrl.cpp

LLUI V3 (very)partial merge

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

llsliderctrl.h

LLUI V3 (very)partial merge

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

llspinctrl.cpp

Added physics settings to object features panel. Brought in mesh 'prim cost' fetching and now display cost in edit floater if mesh is enabled.

2011-08-01 01:33:07 -05:00

llspinctrl.h

I got bored and put in the math functions from Imprudence.

2010-09-16 22:08:33 -04: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

Imported existing code

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

lltabcontainer.cpp

LLFrameTimer review and resulting changes.

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

lltabcontainer.h

Imported existing code

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

Imported existing code

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

lltextbox.h

Imported existing code

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

lltexteditor.cpp

LLTextParser now a singleton.

2011-07-31 19:09:47 -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

llui.cpp

Replaced some opengl fixed functions with shaders. Temporary ShyotlUseLegacyRenderPath setting to debug if this change actually improves framerate at all (setting not tied to callbacks. Have to toggle shaders to have stuff pick up the setting change)

2011-08-10 03:53:49 -05:00

llui.h

Replaced some opengl fixed functions with shaders. Temporary ShyotlUseLegacyRenderPath setting to debug if this change actually improves framerate at all (setting not tied to callbacks. Have to toggle shaders to have stuff pick up the setting change)

2011-08-10 03:53:49 -05:00

lluiconstants.h

Imported existing code

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

lluictrl.cpp

Added physics settings to object features panel. Brought in mesh 'prim cost' fetching and now display cost in edit floater if mesh is enabled.

2011-08-01 01:33:07 -05:00

lluictrl.h

Added new setCommitCallback and setValidateCallback to LLUICtrl, using boost::signals2. Kept legacy variants for now since they are just used too frequently to remove right now.

2011-07-31 19:08:08 -05:00

lluictrlfactory.cpp

The Octopus Feature

2011-03-24 23:54:23 +01:00

lluictrlfactory.h

The Octopus Feature

2011-03-24 23:54:23 +01: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

lluitrans.cpp

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

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

lluitrans.h

Imported existing code

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

Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.

2011-07-17 19:59:30 -05:00

llview.h

Setting through LLView::userSetShape now done through LLView::setShape. LLView::snappedTo renamed to LLView::setSnappedTo. virtual overriding of LLView::userSetShape now done through LLView::handleReshape which LLView::setShape calls.

2011-07-17 19:59:30 -05:00

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

llviewborder.h

Imported existing code

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