Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer

This commit is contained in:
Aleric Inglewood
2011-06-03 22:48:23 +02:00
92 changed files with 3849 additions and 4484 deletions

View File

@@ -2840,13 +2840,6 @@ void LLFloaterCustomize::updateInventoryUI()
}
}
// OGPX : In place because Assets are not currently supported in OGPX.
// This was originally added as part of OGP9 svn branch because the viewer deeply deeply
// assumes that there *will* be an inventory there. If you never get an inventory,
// Make Outfit breaks badly.
// OGPX TODO: When assets/inventory are supported, the check below can be removed.
// OGPX test if (!gSavedSettings.getString("CmdLineRegionURI").empty()) {all_complete = FALSE;}
childSetEnabled("Make Outfit", all_complete);
}