livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Post merge cleanup.

meow-7.2.2
Nicky 2017-02-06 15:49:09 +01:00
parent 34f01e38bc
commit 2e04738b5a
9 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -1859,9 +1859,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>06e6ada281c0cf37ced1aad58c3e9bb4</string>
<string>96d11160278115f6d468171f67aa7a4e</string>
<key>url</key>
<string>file:///opt/firestorm/kdu-7.8.0-linux-201604022334-r52.tar.bz2</string>
<string>file:///opt/firestorm/kdu-7.9.0-linux-201701222135-r58.tar.bz2</string>
</map>
<key>name</key>
<string>linux64</string>
@ -1883,9 +1883,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>15da99a3c7dbe2b56a19baced0f9bd54</string>
<string>26cc3fbe6a3b9885d697aa639d17a20a</string>
<key>url</key>
<string>file:///c:/cygwin/opt/firestorm/kdu-7.8.0-windows-201604022251-r52.tar.bz2</string>
<string>file:///c:/cygwin/opt/firestorm/kdu-7.9.0-windows-201701221929-r58.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>

2
indra/llappearance/llavatarappearance.cpp
View File

@ -2156,3 +2156,5 @@ LLAvatarAppearance::LLMaskedMorph::LLMaskedMorph(LLVisualParam *morph_target, BO
}
}

13
indra/llprimitive/lldaeloader.cpp
View File

@ -1052,11 +1052,6 @@ bool LLDAELoader::OpenFile(const std::string& filename)
std::sort(mModelList.begin(), mModelList.end(), ModelSort());
if (!mNoNormalize)
{
LLModel::normalizeModels(mModelList);
}
model_list::iterator model_iter = mModelList.begin();
while (model_iter != mModelList.end())
{
@ -2542,6 +2537,8 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo
//
ret->sortVolumeFacesByMaterialName();
bool normalized = false;
int submodelID = 0;
// remove all faces that definitely won't fit into one model and submodel limit
@ -2556,6 +2553,12 @@ bool LLDAELoader::loadModelsFromDomMesh(domMesh* mesh, std::vector<LLModel*>& mo
{
// Insure we do this once with the whole gang and not per-model
//
if (!normalized && !mNoNormalize)
{
normalized = true;
ret->normalizeVolumeFaces();
}
ret->trimVolumeFacesToSize(LL_SCULPT_MESH_MAX_FACES, &remainder);
if (!mNoOptimize)

42
indra/newview/llfloaterbeacons.cpp
View File

@ -101,31 +101,33 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl)
else if(name == "highlights")
{
LLPipeline::toggleRenderHighlights();
// FS:LO Allow beacons to be turned off fully by unchecking both boxes
// Don't allow both to be OFF at the same time. Toggle the other one on if both now off.
if (
!LLPipeline::getRenderBeacons() &&
!LLPipeline::getRenderHighlights() )
{
LLPipeline::setRenderBeacons(true);
getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(TRUE));
getChild<LLCheckBoxCtrl>("beacons")->setValue(TRUE);
getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
getChild<LLCheckBoxCtrl>("highlights")->setValue(FALSE);
}
// if (
// !LLPipeline::getRenderBeacons() &&
// !LLPipeline::getRenderHighlights() )
// {
// LLPipeline::setRenderBeacons(true);
// getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(TRUE));
// getChild<LLCheckBoxCtrl>("beacons")->setValue(TRUE);
// getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
// getChild<LLCheckBoxCtrl>("highlights")->setValue(FALSE);
// }
}
else if(name == "beacons")
{
LLPipeline::toggleRenderBeacons();
// FS:LO Allow beacons to be turned off fully by unchecking both boxes
// Don't allow both to be OFF at the same time. Toggle the other one on if both now off.
if (
!LLPipeline::getRenderBeacons() &&
!LLPipeline::getRenderHighlights() )
{
LLPipeline::setRenderHighlights(true);
getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(TRUE));
getChild<LLCheckBoxCtrl>("highlights")->setValue(TRUE);
getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
getChild<LLCheckBoxCtrl>("beacons")->setValue(FALSE);
}
// if (
// !LLPipeline::getRenderBeacons() &&
// !LLPipeline::getRenderHighlights() )
// {
// LLPipeline::setRenderHighlights(true);
// getChild<LLCheckBoxCtrl>("highlights")->setControlValue(LLSD(TRUE));
// getChild<LLCheckBoxCtrl>("highlights")->setValue(TRUE);
// getChild<LLCheckBoxCtrl>("beacons")->setControlValue(LLSD(FALSE)); // just to be sure it's in sync with llpipeline
// getChild<LLCheckBoxCtrl>("beacons")->setValue(FALSE);
// }
}
}

1
indra/newview/lltracker.cpp
View File

@ -62,6 +62,7 @@
#include "llworldmapview.h"
#include "llviewercontrol.h"
const F32 DESTINATION_REACHED_RADIUS = 3.0f;
const F32 DESTINATION_VISITED_RADIUS = 6.0f;

2
indra/newview/llviewermenu.cpp
View File

@ -421,7 +421,6 @@ void LLMenuParcelObserver::changed()
static LLView* land_buy_pass_pie = gMenuHolder->getChildView("Land Buy Pass Pie");
static LLView* land_buy = gMenuHolder->getChildView("Land Buy");
static LLView* land_buy_pie = gMenuHolder->getChildView("Land Buy Pie");
static LLView* buy_land = gMenuHolder->getChildView("Buy Land...");
BOOL pass_buyable = LLPanelLandGeneral::enableBuyPass(NULL) && parcel->getOwnerID() != gAgentID;
land_buy_pass->setEnabled(pass_buyable);
@ -430,7 +429,6 @@ void LLMenuParcelObserver::changed()
BOOL buyable = enable_buy_land(NULL);
land_buy->setEnabled(buyable);
land_buy_pie->setEnabled(buyable);
buy_land->setEnabled(buyable);
// </FS:Ansariel> FIRE-4454: Cache controls because of performance reasons
}

6
indra/newview/llviewerwindow.cpp
View File

@ -817,11 +817,13 @@ public:
ypos += y_inc;
}
if (LLPipeline::toggleRenderTypeControlNegated(LLPipeline::RENDER_TYPE_PARTICLES))
// <FS:LO> pull the text saying if particles are hidden out from beacons
/*if (LLPipeline::toggleRenderTypeControlNegated((void*)LLPipeline::RENDER_TYPE_PARTICLES))
{
addText(xpos, ypos, particle_hiding);
ypos += y_inc;
}
}*/
// </FS:LO>
if (LLPipeline::getRenderParticleBeacons())
{

7
indra/newview/pipeline.cpp
View File

@ -3516,7 +3516,6 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
if (LLViewerCamera::sCurCameraID == LLViewerCamera::CAMERA_WORLD)
{
LLSpatialGroup* last_group = NULL;
BOOL fov_changed = LLViewerCamera::getInstance()->isDefaultFOVChanged();
for (LLCullResult::bridge_iterator i = sCull->beginVisibleBridge(); i != sCull->endVisibleBridge(); ++i)
{
LLCullResult::bridge_iterator cur_iter = i;
@ -3530,7 +3529,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
if (!bridge->isDead() && group && !group->isOcclusionState(LLSpatialGroup::OCCLUDED))
{
stateSort(bridge, camera, fov_changed);
stateSort(bridge, camera);
}
if (LLViewerCamera::sCurCameraID == LLViewerCamera::CAMERA_WORLD &&
@ -3602,9 +3601,9 @@ void LLPipeline::stateSort(LLSpatialGroup* group, LLCamera& camera)
}
void LLPipeline::stateSort(LLSpatialBridge* bridge, LLCamera& camera, BOOL fov_changed)
void LLPipeline::stateSort(LLSpatialBridge* bridge, LLCamera& camera)
{
if (bridge->getSpatialGroup()->changeLOD() || fov_changed)
if (bridge->getSpatialGroup()->changeLOD())
{
bool force_update = false;
bridge->updateDistance(camera, force_update);

2
indra/newview/pipeline.h
View File

@ -254,7 +254,7 @@ public:
void stateSort(LLCamera& camera, LLCullResult& result);
void stateSort(LLSpatialGroup* group, LLCamera& camera);
void stateSort(LLSpatialBridge* bridge, LLCamera& camera, BOOL fov_changed = FALSE);
void stateSort(LLSpatialBridge* bridge, LLCamera& camera);
void stateSort(LLDrawable* drawablep, LLCamera& camera);
void postSort(LLCamera& camera);
void forAllVisibleDrawables(void (*func)(LLDrawable*));