livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llinventory
History
Nicky 161c1b019f Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
 		2012-01-17 17:57:52 +01:00
..
tests correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
CMakeLists.txt convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04: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 Merge up to LL FUI 2011-10-28 02:00:09 -04:00
llinventory.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04: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 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
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 Initialize variables (GCC warning). 2011-11-01 18:49:56 +01:00
llparcel.h Sh-2129 Viewer caps implementation for resource cost selected. Also cleanup of old code related to earlier accounting work. 2011-08-02 17:01:46 -04: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 Inventory cache optimization, by Nicky Dasmijn 2011-10-15 13:28:01 -04:00
llpermissions.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llpermissionsflags.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llsaleinfo.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llsaleinfo.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04: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