diff options
| author | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-02-22 15:14:05 +0200 |
|---|---|---|
| committer | Ruslan Teliuk <ruslantproductengine@lindenlab.com> | 2016-02-22 15:14:05 +0200 |
| commit | c9370c75e89a8c27e07709118ac441cae36a7b9f (patch) | |
| tree | a6f147bcac5f22cef0f63b63fc2a734fd0042513 | |
| parent | d4cb7f450d3173a3b40d352ec52f8d82036266b2 (diff) | |
| parent | 81d5e6e351e6cfd2e6c9b826a8e4dbca940463e0 (diff) | |
Merged oz_linden/391-blizzard into default
| -rw-r--r-- | indra/newview/llpanelpresetspulldown.cpp | 6 | ||||
| -rwxr-xr-x | indra/newview/llviewerpartsim.cpp | 19 |
2 files changed, 16 insertions, 9 deletions
diff --git a/indra/newview/llpanelpresetspulldown.cpp b/indra/newview/llpanelpresetspulldown.cpp index 175f281ca4..70f5fcd2c0 100644 --- a/indra/newview/llpanelpresetspulldown.cpp +++ b/indra/newview/llpanelpresetspulldown.cpp @@ -89,14 +89,18 @@ void LLPanelPresetsPulldown::populatePanel() row["columns"][0]["column"] = "preset_name"; row["columns"][0]["value"] = name; + bool is_selected_preset = false; if (name == gSavedSettings.getString("PresetGraphicActive")) { row["columns"][1]["column"] = "icon"; row["columns"][1]["type"] = "icon"; row["columns"][1]["value"] = "Check_Mark"; + + is_selected_preset = true; } - scroll->addElement(row); + LLScrollListItem* new_item = scroll->addElement(row); + new_item->setSelected(is_selected_preset); } } } diff --git a/indra/newview/llviewerpartsim.cpp b/indra/newview/llviewerpartsim.cpp index 230bdca4ef..ab510c1e95 100755 --- a/indra/newview/llviewerpartsim.cpp +++ b/indra/newview/llviewerpartsim.cpp @@ -39,6 +39,7 @@ #include "llworld.h" #include "pipeline.h" #include "llspatialpartition.h" +#include "llvoavatarself.h" #include "llvovolume.h" const F32 PART_SIM_BOX_SIDE = 16.f; @@ -703,16 +704,18 @@ void LLViewerPartSim::updateSimulation() if (!mViewerPartSources[i]->isDead()) { BOOL upd = TRUE; - if (!LLPipeline::sRenderAttachedParticles) + LLViewerObject* vobj = mViewerPartSources[i]->mSourceObjectp; + if (vobj && (vobj->getPCode() == LL_PCODE_VOLUME)) { - LLViewerObject* vobj = mViewerPartSources[i]->mSourceObjectp; - if (vobj && (vobj->getPCode() == LL_PCODE_VOLUME)) + if(vobj->getAvatar() && vobj->getAvatar()->isTooComplex()) { - LLVOVolume* vvo = (LLVOVolume *)vobj; - if (vvo && vvo->isAttachment()) - { - upd = FALSE; - } + upd = FALSE; + } + + LLVOVolume* vvo = (LLVOVolume *)vobj; + if (!LLPipeline::sRenderAttachedParticles && vvo && vvo->isAttachment()) + { + upd = FALSE; } } |