livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llprimitive
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 Merge catchup with trunk tip, no changes 2011-10-28 13:29:59 -04:00
legacy_object_types.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llmaterialtable.cpp ER-70: from a sim bug, but object can also crash viewer. Fixed NULL. Reviewed 2011-09-27 09:32:36 -07:00
llmaterialtable.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llmediaentry.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llmediaentry.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llmodel.cpp bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08:00
llmodel.h Handling of material mismatches - lod materials are required to be a subset of the high lod, introduced addEmptyFace() for when parity does not exist between model material counts 2011-08-30 09:32:16 -04:00
llprimitive.cpp Opensim - detect and use various configuration limits which might be different from SL, by ArminW 2011-08-28 07:10:09 -04:00
llprimitive.h Merge up to LL FUI 2011-10-28 02:00:09 -04:00
llprimlinkinfo.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llprimtexturelist.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llprimtexturelist.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lltextureanim.cpp Pulling fix for SH-2449 by Runitai - Fixes one particular issue with texture animations, texture scaling is presered when sizeX and sizeY are set to 0. 2011-12-08 14:29:57 +01:00
lltextureanim.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lltextureentry.cpp STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett) 2011-03-11 15:09:44 -08:00
lltextureentry.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lltree_common.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lltreeparams.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
lltreeparams.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
llvolumemessage.cpp VWR-24487 make PREHASH variables char const* const 2011-04-01 09:14:52 -04:00
llvolumemessage.h VWR-24487 make PREHASH variables char const* const 2011-04-01 09:14:52 -04:00
llvolumexml.cpp a try fix for sh-2651: [crashhunters] Crash after google translate failure 2011-11-28 11:33:49 -07:00
llvolumexml.h a try fix for sh-2651: [crashhunters] Crash after google translate failure 2011-11-28 11:33:49 -07:00
material_codes.cpp correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
material_codes.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
object_flags.h correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00