phoenix-firestorm/indra/llinventory
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
..
tests correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
CMakeLists.txt Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
llcategory.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llcategory.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lleconomy.cpp EXP-1563 FIXED Negative upload cost displayed on the "Save to My Inventory" button. 2011-11-11 01:37:41 +02:00
lleconomy.h EXP-1563 FIXED Negative upload cost displayed on the "Save to My Inventory" button. 2011-11-11 01:37:41 +02:00
llinventory.cpp SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump 2013-01-15 20:30:20 -05:00
llinventory.h merging in viewer-beta. 2013-01-24 16:22:49 -05:00
llinventorydefines.cpp Forgot to give myself credit. 2010-11-25 13:45:05 -05:00
llinventorydefines.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llinventorytype.cpp EXP-1286 : First pass at Drag and Drop of tools. Not functional. Most hooks into the LLToolDragAndDrop system in to support the new AT_WIDGET and SOURCE_VIEWER 2011-10-03 16:27:24 -07:00
llinventorytype.h Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender. 2012-09-08 04:39:11 +00:00
lllandmark.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lllandmark.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llnotecard.cpp VWR-24263: Crash fix for notecards with negative text length 2010-12-14 12:30:32 -08:00
llnotecard.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llparcel.cpp MAINT-1601 Land remains for sale after purchasing for group. 2012-09-21 13:32:25 -07:00
llparcel.h MAINT-1601 Land remains for sale after purchasing for group. 2012-09-21 13:32:25 -07:00
llparcelflags.h ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel 2011-07-01 14:06:08 -07:00
llpermissions.cpp Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
llpermissions.h Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
llpermissionsflags.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llsaleinfo.cpp Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
llsaleinfo.h Partial rewrite of llifstream and llofstream (Windows implementation pending). Moved more functionality from llviewerwearable to llwearable 2012-09-20 04:29:17 +00:00
lltransactionflags.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lltransactionflags.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lltransactiontypes.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lluserrelations.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lluserrelations.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00