livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,854 Commits
2 Branches
0 Tags
297 MiB
C++ 86.3%
R 8.1%
GLSL 1.7%
HTML 1.1%
Python 0.8%
Other 1.9%
 
 
 
 
 
 
Go to file
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
.hgpatchinfo Merged with RLVa-1.4.3 tip 2011-11-10 23:17:58 +01:00
doc Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
etc Automated merge up from viewer-development 2011-01-14 14:16:07 -05:00
indra Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
scripts FIRE-3974; Don't let newlines sneak into LL_CHANNEL. 2011-12-12 21:33:13 +01:00
.hgignore Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
.hgtags Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
BuildParams update build params for oz viewer-trial build 2011-12-19 15:25:39 -05:00
FIRESTORM-FEATURETABLE.txt Feature table updates 2011-06-29 02:38:48 -04:00
FIRESTORM-SOURCE_LICENSE_HEADER.txt Added license template header for Firestorm source files 2011-01-19 11:57:13 -08:00
README_BUILD_FIRESTORM_LINUX.txt Configuration fix 2011-09-03 20:17:29 +02:00
README_BUILD_FIRESTORM_MACOSX.txt Merged with default tip 2011-11-26 00:29:22 +01:00
README_BUILD_FIRESTORM_WIN32.txt Small fix Build Documentation for Windows 2011-09-01 20:23:21 +02:00
autobuild.xml Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip) 2012-01-17 17:57:52 +01:00
build.sh Re-indent teamcity service messages when scanning build logs to fix incredibuild formatting. 2011-07-20 11:48:57 -07:00