Merged oz_linden/391-blizzard into default

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);
 		}
 	}
 }

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))
 			{
-					LLVOVolume* vvo = (LLVOVolume *)vobj;
-					if (vvo && vvo->isAttachment())
+				if(vobj->getAvatar() && vobj->getAvatar()->isTooComplex())
 				{
 					upd = FALSE;
 				}
+
+				LLVOVolume* vvo = (LLVOVolume *)vobj;
+				if (!LLPipeline::sRenderAttachedParticles && vvo && vvo->isAttachment())
+				{
+					upd = FALSE;
 				}
 			}