Conflicts:
	indra/newview/llfloateravatarpicker.cpp - Includes to v-d style, since plain alphabetical just won't cut it. Shyotl's changes for name system, here.
	indra/newview/llpanelgroupinvite.cpp - Shyotl's changes for name system, here.

Also corrected new README to have less typos and be slightly more accurate.
This commit is contained in:
Lirusaito
2012-12-10 11:24:25 -05:00
333 changed files with 11005 additions and 6945 deletions

View File

@@ -1538,7 +1538,8 @@ void LLViewerRegion::unpackRegionHandshake()
// all of our terrain stuff, by
if (compp->getParamsReady())
{
getLand().dirtyAllPatches();
//this line creates frame stalls on region crossing and removing it appears to have no effect
//getLand().dirtyAllPatches();
}
else
{