Some refactoring for stuff that caught my eye...

Mon, 05 Jan 2015 13:02:24 +0100

author
Ansariel
date
Mon, 05 Jan 2015 13:02:24 +0100
changeset 43098
46b49a03f1d3
parent 43097
b6bd26d2a121
child 43099
9ecea804a06d

Some refactoring for stuff that caught my eye...

indra/newview/NACLfloaterexploresounds.cpp file | annotate | diff | revisions
indra/newview/fsfloateraddtocontactset.cpp file | annotate | diff | revisions
indra/newview/fslslbridgerequest.cpp file | annotate | diff | revisions
indra/newview/particleeditor.cpp file | annotate | diff | revisions
indra/newview/particleeditor.h file | annotate | diff | revisions
indra/newview/sanitycheck.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/NACLfloaterexploresounds.cpp	Mon Jan 05 10:32:05 2015 +0100
     1.2 +++ b/indra/newview/NACLfloaterexploresounds.cpp	Mon Jan 05 13:02:24 2015 +0100
     1.3 @@ -88,7 +88,7 @@
     1.4  
     1.5  void NACLFloaterExploreSounds::handleSelection()
     1.6  {
     1.7 -	S32 num_selected = mHistoryScroller->getAllSelected().size();
     1.8 +	size_t num_selected = mHistoryScroller->getAllSelected().size();
     1.9  	bool multiple = (num_selected > 1);
    1.10  	childSetEnabled("look_at_btn", (num_selected && !multiple));
    1.11  	childSetEnabled("play_locally_btn", num_selected);
     2.1 --- a/indra/newview/fsfloateraddtocontactset.cpp	Mon Jan 05 10:32:05 2015 +0100
     2.2 +++ b/indra/newview/fsfloateraddtocontactset.cpp	Mon Jan 05 13:02:24 2015 +0100
     2.3 @@ -43,9 +43,9 @@
     2.4  	if (target.isArray())
     2.5  	{
     2.6  		mHasMultipleAgents = true;
     2.7 -		for (S32 i = 0; i < target.size(); ++i)
     2.8 +		for (LLSD::array_const_iterator it = target.beginArray(); it != target.endArray(); ++it)
     2.9  		{
    2.10 -			mAgentIDs.push_back(target[i].asUUID());
    2.11 +			mAgentIDs.push_back((*it).asUUID());
    2.12  		}
    2.13  	}
    2.14  	else
     3.1 --- a/indra/newview/fslslbridgerequest.cpp	Mon Jan 05 10:32:05 2015 +0100
     3.2 +++ b/indra/newview/fslslbridgerequest.cpp	Mon Jan 05 13:02:24 2015 +0100
     3.3 @@ -89,7 +89,7 @@
     3.4  			FSRadarEntry* entry = radar->getEntry(targetAv);
     3.5  			if (entry)
     3.6  			{
     3.7 -				entry->setZOffset((F32)(targetZ));
     3.8 +				entry->setZOffset(targetZ);
     3.9  				//LL_INFOS() << targetAv << " ::: " << targetZ << LL_ENDL;
    3.10  			}
    3.11  		}
     4.1 --- a/indra/newview/particleeditor.cpp	Mon Jan 05 10:32:05 2015 +0100
     4.2 +++ b/indra/newview/particleeditor.cpp	Mon Jan 05 13:02:24 2015 +0100
     4.3 @@ -57,39 +57,39 @@
     4.4  	mObject(0),
     4.5  	mParticleScriptInventoryItem(0)
     4.6  {
     4.7 -	mPatternMap["drop"]=LLPartSysData::LL_PART_SRC_PATTERN_DROP;
     4.8 -	mPatternMap["explode"]=LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE;
     4.9 -	mPatternMap["angle"]=LLPartSysData::LL_PART_SRC_PATTERN_ANGLE;
    4.10 -	mPatternMap["angle_cone"]=LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE;
    4.11 -	mPatternMap["angle_cone_empty"]=LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY;
    4.12 +	mPatternMap["drop"] = LLPartSysData::LL_PART_SRC_PATTERN_DROP;
    4.13 +	mPatternMap["explode"] = LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE;
    4.14 +	mPatternMap["angle"] = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE;
    4.15 +	mPatternMap["angle_cone"] = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE;
    4.16 +	mPatternMap["angle_cone_empty"] = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY;
    4.17  
    4.18 -	mScriptPatternMap["drop"]="PSYS_SRC_PATTERN_DROP";
    4.19 -	mScriptPatternMap["explode"]="PSYS_SRC_PATTERN_EXPLODE";
    4.20 -	mScriptPatternMap["angle"]="PSYS_SRC_PATTERN_ANGLE";
    4.21 -	mScriptPatternMap["angle_cone"]="PSYS_SRC_PATTERN_ANGLE_CONE";
    4.22 -	mScriptPatternMap["angle_cone_empty"]="PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY";
    4.23 +	mScriptPatternMap["drop"] = "PSYS_SRC_PATTERN_DROP";
    4.24 +	mScriptPatternMap["explode"] = "PSYS_SRC_PATTERN_EXPLODE";
    4.25 +	mScriptPatternMap["angle"] = "PSYS_SRC_PATTERN_ANGLE";
    4.26 +	mScriptPatternMap["angle_cone"] = "PSYS_SRC_PATTERN_ANGLE_CONE";
    4.27 +	mScriptPatternMap["angle_cone_empty"] = "PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY";
    4.28  
    4.29 -	mBlendMap["blend_one"]=LLPartData::LL_PART_BF_ONE;
    4.30 -	mBlendMap["blend_zero"]=LLPartData::LL_PART_BF_ZERO;
    4.31 -	mBlendMap["blend_dest_color"]=LLPartData::LL_PART_BF_DEST_COLOR;
    4.32 -	mBlendMap["blend_src_color"]=LLPartData::LL_PART_BF_SOURCE_COLOR;
    4.33 -	mBlendMap["blend_one_minus_dest_color"]=LLPartData::LL_PART_BF_ONE_MINUS_DEST_COLOR;
    4.34 -	mBlendMap["blend_one_minus_src_color"]=LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_COLOR;
    4.35 -	mBlendMap["blend_src_alpha"]=LLPartData::LL_PART_BF_SOURCE_ALPHA;
    4.36 -	mBlendMap["blend_one_minus_src_alpha"]=LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_ALPHA;
    4.37 +	mBlendMap["blend_one"] = LLPartData::LL_PART_BF_ONE;
    4.38 +	mBlendMap["blend_zero"] = LLPartData::LL_PART_BF_ZERO;
    4.39 +	mBlendMap["blend_dest_color"] = LLPartData::LL_PART_BF_DEST_COLOR;
    4.40 +	mBlendMap["blend_src_color"] = LLPartData::LL_PART_BF_SOURCE_COLOR;
    4.41 +	mBlendMap["blend_one_minus_dest_color"] = LLPartData::LL_PART_BF_ONE_MINUS_DEST_COLOR;
    4.42 +	mBlendMap["blend_one_minus_src_color"] = LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_COLOR;
    4.43 +	mBlendMap["blend_src_alpha"] = LLPartData::LL_PART_BF_SOURCE_ALPHA;
    4.44 +	mBlendMap["blend_one_minus_src_alpha"] = LLPartData::LL_PART_BF_ONE_MINUS_SOURCE_ALPHA;
    4.45  
    4.46 -	mScriptBlendMap["blend_one"]="PSYS_PART_BF_ONE";
    4.47 -	mScriptBlendMap["blend_zero"]="PSYS_PART_BF_ZERO";
    4.48 -	mScriptBlendMap["blend_dest_color"]="PSYS_PART_BF_DEST_COLOR";
    4.49 -	mScriptBlendMap["blend_src_color"]="PSYS_PART_BF_SOURCE_COLOR";
    4.50 -	mScriptBlendMap["blend_one_minus_dest_color"]="PSYS_PART_BF_ONE_MINUS_DEST_COLOR";
    4.51 -	mScriptBlendMap["blend_one_minus_src_color"]="PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR";
    4.52 -	mScriptBlendMap["blend_src_alpha"]="PSYS_PART_BF_SOURCE_ALPHA";
    4.53 -	mScriptBlendMap["blend_one_minus_src_alpha"]="PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA";
    4.54 +	mScriptBlendMap["blend_one"] = "PSYS_PART_BF_ONE";
    4.55 +	mScriptBlendMap["blend_zero"] = "PSYS_PART_BF_ZERO";
    4.56 +	mScriptBlendMap["blend_dest_color"] = "PSYS_PART_BF_DEST_COLOR";
    4.57 +	mScriptBlendMap["blend_src_color"] = "PSYS_PART_BF_SOURCE_COLOR";
    4.58 +	mScriptBlendMap["blend_one_minus_dest_color"] = "PSYS_PART_BF_ONE_MINUS_DEST_COLOR";
    4.59 +	mScriptBlendMap["blend_one_minus_src_color"] = "PSYS_PART_BF_ONE_MINUS_SOURCE_COLOR";
    4.60 +	mScriptBlendMap["blend_src_alpha"] = "PSYS_PART_BF_SOURCE_ALPHA";
    4.61 +	mScriptBlendMap["blend_one_minus_src_alpha"] = "PSYS_PART_BF_ONE_MINUS_SOURCE_ALPHA";
    4.62  
    4.63  	// I don't really like referencing the particle texture name here, but it's being done
    4.64  	// like this all over the viewer, so this is apparently how it's meant to be. -Zi
    4.65 -	mDefaultParticleTexture=LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
    4.66 +	mDefaultParticleTexture = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c");
    4.67  }
    4.68  
    4.69  ParticleEditor::~ParticleEditor()
    4.70 @@ -101,117 +101,117 @@
    4.71  
    4.72  BOOL ParticleEditor::postBuild()
    4.73  {
    4.74 -	LLPanel* panel=getChild<LLPanel>("particle_editor_panel");
    4.75 +	LLPanel* panel = getChild<LLPanel>("particle_editor_panel");
    4.76  
    4.77 -	mMainPanel=panel;
    4.78 +	mMainPanel = panel;
    4.79  
    4.80 -	mPatternTypeCombo=panel->getChild<LLComboBox>("pattern_type_combo");
    4.81 -	mTexturePicker=panel->getChild<LLTextureCtrl>("texture_picker");
    4.82 +	mPatternTypeCombo = panel->getChild<LLComboBox>("pattern_type_combo");
    4.83 +	mTexturePicker = panel->getChild<LLTextureCtrl>("texture_picker");
    4.84  
    4.85 -	mBurstRateSpinner=panel->getChild<LLSpinCtrl>("burst_rate_spinner");
    4.86 -	mBurstCountSpinner=panel->getChild<LLSpinCtrl>("burst_count_spinner");
    4.87 -	mBurstRadiusSpinner=panel->getChild<LLSpinCtrl>("burst_radius_spinner");
    4.88 -	mAngleBeginSpinner=panel->getChild<LLSpinCtrl>("angle_begin_spinner");
    4.89 -	mAngleEndSpinner=panel->getChild<LLSpinCtrl>("angle_end_spinner");
    4.90 -	mBurstSpeedMinSpinner=panel->getChild<LLSpinCtrl>("burst_speed_min_spinner");
    4.91 -	mBurstSpeedMaxSpinner=panel->getChild<LLSpinCtrl>("burst_speed_max_spinner");
    4.92 -	mStartAlphaSpinner=panel->getChild<LLSpinCtrl>("start_alpha_spinner");
    4.93 -	mEndAlphaSpinner=panel->getChild<LLSpinCtrl>("end_alpha_spinner");
    4.94 -	mScaleStartXSpinner=panel->getChild<LLSpinCtrl>("scale_start_x_spinner");
    4.95 -	mScaleStartYSpinner=panel->getChild<LLSpinCtrl>("scale_start_y_spinner");
    4.96 -	mScaleEndXSpinner=panel->getChild<LLSpinCtrl>("scale_end_x_spinner");
    4.97 -	mScaleEndYSpinner=panel->getChild<LLSpinCtrl>("scale_end_y_spinner");
    4.98 -	mSourceMaxAgeSpinner=panel->getChild<LLSpinCtrl>("source_max_age_spinner");
    4.99 -	mParticlesMaxAgeSpinner=panel->getChild<LLSpinCtrl>("particles_max_age_spinner");
   4.100 -	mStartGlowSpinner=panel->getChild<LLSpinCtrl>("start_glow_spinner");
   4.101 -	mEndGlowSpinner=panel->getChild<LLSpinCtrl>("end_glow_spinner");
   4.102 +	mBurstRateSpinner = panel->getChild<LLSpinCtrl>("burst_rate_spinner");
   4.103 +	mBurstCountSpinner = panel->getChild<LLSpinCtrl>("burst_count_spinner");
   4.104 +	mBurstRadiusSpinner = panel->getChild<LLSpinCtrl>("burst_radius_spinner");
   4.105 +	mAngleBeginSpinner = panel->getChild<LLSpinCtrl>("angle_begin_spinner");
   4.106 +	mAngleEndSpinner = panel->getChild<LLSpinCtrl>("angle_end_spinner");
   4.107 +	mBurstSpeedMinSpinner = panel->getChild<LLSpinCtrl>("burst_speed_min_spinner");
   4.108 +	mBurstSpeedMaxSpinner = panel->getChild<LLSpinCtrl>("burst_speed_max_spinner");
   4.109 +	mStartAlphaSpinner = panel->getChild<LLSpinCtrl>("start_alpha_spinner");
   4.110 +	mEndAlphaSpinner = panel->getChild<LLSpinCtrl>("end_alpha_spinner");
   4.111 +	mScaleStartXSpinner = panel->getChild<LLSpinCtrl>("scale_start_x_spinner");
   4.112 +	mScaleStartYSpinner = panel->getChild<LLSpinCtrl>("scale_start_y_spinner");
   4.113 +	mScaleEndXSpinner = panel->getChild<LLSpinCtrl>("scale_end_x_spinner");
   4.114 +	mScaleEndYSpinner = panel->getChild<LLSpinCtrl>("scale_end_y_spinner");
   4.115 +	mSourceMaxAgeSpinner = panel->getChild<LLSpinCtrl>("source_max_age_spinner");
   4.116 +	mParticlesMaxAgeSpinner = panel->getChild<LLSpinCtrl>("particles_max_age_spinner");
   4.117 +	mStartGlowSpinner = panel->getChild<LLSpinCtrl>("start_glow_spinner");
   4.118 +	mEndGlowSpinner = panel->getChild<LLSpinCtrl>("end_glow_spinner");
   4.119  
   4.120 -	mBlendFuncSrcCombo=panel->getChild<LLComboBox>("blend_func_src_combo");
   4.121 -	mBlendFuncDestCombo=panel->getChild<LLComboBox>("blend_func_dest_combo");
   4.122 +	mBlendFuncSrcCombo = panel->getChild<LLComboBox>("blend_func_src_combo");
   4.123 +	mBlendFuncDestCombo = panel->getChild<LLComboBox>("blend_func_dest_combo");
   4.124  
   4.125 -	mBounceCheckBox=panel->getChild<LLCheckBoxCtrl>("bounce_checkbox");
   4.126 -	mEmissiveCheckBox=panel->getChild<LLCheckBoxCtrl>("emissive_checkbox");
   4.127 -	mFollowSourceCheckBox=panel->getChild<LLCheckBoxCtrl>("follow_source_checkbox");
   4.128 -	mFollowVelocityCheckBox=panel->getChild<LLCheckBoxCtrl>("follow_velocity_checkbox");
   4.129 -	mInterpolateColorCheckBox=panel->getChild<LLCheckBoxCtrl>("interpolate_color_checkbox");
   4.130 -	mInterpolateScaleCheckBox=panel->getChild<LLCheckBoxCtrl>("interpolate_scale_checkbox");
   4.131 -	mTargetPositionCheckBox=panel->getChild<LLCheckBoxCtrl>("target_position_checkbox");
   4.132 -	mTargetLinearCheckBox=panel->getChild<LLCheckBoxCtrl>("target_linear_checkbox");
   4.133 -	mWindCheckBox=panel->getChild<LLCheckBoxCtrl>("wind_checkbox");
   4.134 -	mRibbonCheckBox=panel->getChild<LLCheckBoxCtrl>("ribbon_checkbox");
   4.135 +	mBounceCheckBox = panel->getChild<LLCheckBoxCtrl>("bounce_checkbox");
   4.136 +	mEmissiveCheckBox = panel->getChild<LLCheckBoxCtrl>("emissive_checkbox");
   4.137 +	mFollowSourceCheckBox = panel->getChild<LLCheckBoxCtrl>("follow_source_checkbox");
   4.138 +	mFollowVelocityCheckBox = panel->getChild<LLCheckBoxCtrl>("follow_velocity_checkbox");
   4.139 +	mInterpolateColorCheckBox = panel->getChild<LLCheckBoxCtrl>("interpolate_color_checkbox");
   4.140 +	mInterpolateScaleCheckBox = panel->getChild<LLCheckBoxCtrl>("interpolate_scale_checkbox");
   4.141 +	mTargetPositionCheckBox = panel->getChild<LLCheckBoxCtrl>("target_position_checkbox");
   4.142 +	mTargetLinearCheckBox = panel->getChild<LLCheckBoxCtrl>("target_linear_checkbox");
   4.143 +	mWindCheckBox = panel->getChild<LLCheckBoxCtrl>("wind_checkbox");
   4.144 +	mRibbonCheckBox = panel->getChild<LLCheckBoxCtrl>("ribbon_checkbox");
   4.145  
   4.146 -	mTargetKeyInput=panel->getChild<LLLineEditor>("target_key_input");
   4.147 +	mTargetKeyInput = panel->getChild<LLLineEditor>("target_key_input");
   4.148  
   4.149 -	mAcellerationXSpinner=panel->getChild<LLSpinCtrl>("acceleration_x_spinner");
   4.150 -	mAcellerationYSpinner=panel->getChild<LLSpinCtrl>("acceleration_y_spinner");
   4.151 -	mAcellerationZSpinner=panel->getChild<LLSpinCtrl>("acceleration_z_spinner");
   4.152 +	mAcellerationXSpinner = panel->getChild<LLSpinCtrl>("acceleration_x_spinner");
   4.153 +	mAcellerationYSpinner = panel->getChild<LLSpinCtrl>("acceleration_y_spinner");
   4.154 +	mAcellerationZSpinner = panel->getChild<LLSpinCtrl>("acceleration_z_spinner");
   4.155  
   4.156 -	mOmegaXSpinner=panel->getChild<LLSpinCtrl>("omega_x_spinner");
   4.157 -	mOmegaYSpinner=panel->getChild<LLSpinCtrl>("omega_y_spinner");
   4.158 -	mOmegaZSpinner=panel->getChild<LLSpinCtrl>("omega_z_spinner");
   4.159 +	mOmegaXSpinner = panel->getChild<LLSpinCtrl>("omega_x_spinner");
   4.160 +	mOmegaYSpinner = panel->getChild<LLSpinCtrl>("omega_y_spinner");
   4.161 +	mOmegaZSpinner = panel->getChild<LLSpinCtrl>("omega_z_spinner");
   4.162  
   4.163 -	mStartColorSelector=panel->getChild<LLColorSwatchCtrl>("start_color_selector");
   4.164 -	mEndColorSelector=panel->getChild<LLColorSwatchCtrl>("end_color_selector");
   4.165 +	mStartColorSelector = panel->getChild<LLColorSwatchCtrl>("start_color_selector");
   4.166 +	mEndColorSelector = panel->getChild<LLColorSwatchCtrl>("end_color_selector");
   4.167  
   4.168 -	mCopyToLSLButton=panel->getChild<LLButton>("copy_button");
   4.169 -	mCopyToLSLButton->setCommitCallback(boost::bind(&ParticleEditor::onCopyButtonClicked,this));
   4.170 +	mCopyToLSLButton = panel->getChild<LLButton>("copy_button");
   4.171 +	mCopyToLSLButton->setCommitCallback(boost::bind(&ParticleEditor::onCopyButtonClicked, this));
   4.172  
   4.173 -	mInjectScriptButton=panel->getChild<LLButton>("inject_button");
   4.174 -	mInjectScriptButton->setCommitCallback(boost::bind(&ParticleEditor::onInjectButtonClicked,this));
   4.175 +	mInjectScriptButton = panel->getChild<LLButton>("inject_button");
   4.176 +	mInjectScriptButton->setCommitCallback(boost::bind(&ParticleEditor::onInjectButtonClicked, this));
   4.177  
   4.178 -	mClearTargetButton=panel->getChild<LLButton>("clear_target_button");
   4.179 -	mClearTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onClearTargetButtonClicked,this));
   4.180 +	mClearTargetButton = panel->getChild<LLButton>("clear_target_button");
   4.181 +	mClearTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onClearTargetButtonClicked, this));
   4.182  
   4.183 -	mPickTargetButton=panel->getChild<LLButton>("pick_target_button");
   4.184 -	mPickTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onTargetPickerButtonClicked,this));
   4.185 +	mPickTargetButton = panel->getChild<LLButton>("pick_target_button");
   4.186 +	mPickTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onTargetPickerButtonClicked, this));
   4.187  
   4.188 -	mPatternTypeCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.189 -	mTexturePicker->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.190 +	mPatternTypeCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.191 +	mTexturePicker->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.192  
   4.193 -	mBurstRateSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.194 -	mBurstCountSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.195 -	mBurstRadiusSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.196 -	mAngleBeginSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.197 -	mAngleEndSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.198 -	mBurstSpeedMinSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.199 -	mBurstSpeedMaxSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.200 -	mStartAlphaSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.201 -	mEndAlphaSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.202 -	mScaleStartXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.203 -	mScaleStartYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.204 -	mScaleEndXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.205 -	mScaleEndYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.206 -	mSourceMaxAgeSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.207 -	mParticlesMaxAgeSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.208 -	mStartGlowSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.209 -	mEndGlowSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.210 +	mBurstRateSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.211 +	mBurstCountSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.212 +	mBurstRadiusSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.213 +	mAngleBeginSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.214 +	mAngleEndSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.215 +	mBurstSpeedMinSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.216 +	mBurstSpeedMaxSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.217 +	mStartAlphaSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.218 +	mEndAlphaSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.219 +	mScaleStartXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.220 +	mScaleStartYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.221 +	mScaleEndXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.222 +	mScaleEndYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.223 +	mSourceMaxAgeSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.224 +	mParticlesMaxAgeSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.225 +	mStartGlowSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.226 +	mEndGlowSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.227  
   4.228 -	mBlendFuncSrcCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.229 -	mBlendFuncDestCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.230 +	mBlendFuncSrcCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.231 +	mBlendFuncDestCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.232  
   4.233 -	mBounceCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.234 -	mEmissiveCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.235 -	mFollowSourceCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.236 -	mFollowVelocityCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.237 -	mInterpolateColorCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.238 -	mInterpolateScaleCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.239 -	mTargetPositionCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.240 -	mTargetLinearCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.241 -	mWindCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.242 -	mRibbonCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.243 +	mBounceCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.244 +	mEmissiveCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.245 +	mFollowSourceCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.246 +	mFollowVelocityCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.247 +	mInterpolateColorCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.248 +	mInterpolateScaleCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.249 +	mTargetPositionCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.250 +	mTargetLinearCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.251 +	mWindCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.252 +	mRibbonCheckBox->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.253  
   4.254 -	mTargetKeyInput->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.255 +	mTargetKeyInput->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.256  
   4.257 -	mAcellerationXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.258 -	mAcellerationYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.259 -	mAcellerationZSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.260 +	mAcellerationXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.261 +	mAcellerationYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.262 +	mAcellerationZSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.263  
   4.264 -	mOmegaXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.265 -	mOmegaYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.266 -	mOmegaZSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.267 +	mOmegaXSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.268 +	mOmegaYSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.269 +	mOmegaZSpinner->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.270  
   4.271 -	mStartColorSelector->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.272 -	mEndColorSelector->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange,this));
   4.273 +	mStartColorSelector->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.274 +	mEndColorSelector->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this));
   4.275  
   4.276  	mStartColorSelector->setCanApplyImmediately(TRUE);
   4.277  	mEndColorSelector->setCanApplyImmediately(TRUE);
   4.278 @@ -227,7 +227,7 @@
   4.279  
   4.280  void ParticleEditor::clearParticles()
   4.281  {
   4.282 -	if(!mObject)
   4.283 +	if (!mObject)
   4.284  		return;
   4.285  
   4.286  	LL_DEBUGS() << "clearing particles from " << mObject->getID() << LL_ENDL;
   4.287 @@ -237,11 +237,11 @@
   4.288  
   4.289  void ParticleEditor::updateParticles()
   4.290  {
   4.291 -	if(!mObject)
   4.292 +	if (!mObject)
   4.293  		return;
   4.294  
   4.295  	clearParticles();
   4.296 -	LLPointer<LLViewerPartSourceScript> pss=LLViewerPartSourceScript::createPSS(mObject,mParticles);
   4.297 +	LLPointer<LLViewerPartSourceScript> pss = LLViewerPartSourceScript::createPSS(mObject, mParticles);
   4.298  
   4.299  	pss->setOwnerUUID(mObject->getID());
   4.300  	pss->setImage(mTexture);
   4.301 @@ -251,9 +251,9 @@
   4.302  
   4.303  void ParticleEditor::setObject(LLViewerObject* objectp)
   4.304  {
   4.305 -	if(objectp)
   4.306 +	if (objectp)
   4.307  	{
   4.308 -		mObject=objectp;
   4.309 +		mObject = objectp;
   4.310  
   4.311  		LL_DEBUGS() << "adding particles to " << mObject->getID() << LL_ENDL;
   4.312  
   4.313 @@ -263,59 +263,61 @@
   4.314  
   4.315  void ParticleEditor::onParameterChange()
   4.316  {
   4.317 -	mParticles.mPattern=mPatternMap[mPatternTypeCombo->getSelectedValue()];
   4.318 -	mParticles.mPartImageID=mTexturePicker->getImageAssetID();
   4.319 +	mParticles.mPattern = mPatternMap[mPatternTypeCombo->getSelectedValue()];
   4.320 +	mParticles.mPartImageID = mTexturePicker->getImageAssetID();
   4.321  
   4.322  	// remember the selected texture here to give updateParticles() a UUID to work with
   4.323 -	mTexture=LLViewerTextureManager::getFetchedTexture(mTexturePicker->getImageAssetID());
   4.324 +	mTexture = LLViewerTextureManager::getFetchedTexture(mTexturePicker->getImageAssetID());
   4.325  
   4.326 -	if(mTexture->getID()==IMG_DEFAULT || mTexture->getID().isNull())
   4.327 -		mTexture=mDefaultParticleTexture;
   4.328 +	if (mTexture->getID() == IMG_DEFAULT || mTexture->getID().isNull())
   4.329 +	{
   4.330 +		mTexture = mDefaultParticleTexture;
   4.331 +	}
   4.332  
   4.333  	// limit burst rate to 0.01 to avoid internal freeze, script still gets the real value
   4.334 -	mParticles.mBurstRate=llmax(0.01f,mBurstRateSpinner->getValueF32());
   4.335 -	mParticles.mBurstPartCount=mBurstCountSpinner->getValue().asInteger();
   4.336 -	mParticles.mBurstRadius=mBurstRadiusSpinner->getValueF32();
   4.337 -	mParticles.mInnerAngle=mAngleBeginSpinner->getValueF32();
   4.338 -	mParticles.mOuterAngle=mAngleEndSpinner->getValueF32();
   4.339 -	mParticles.mBurstSpeedMin=mBurstSpeedMinSpinner->getValueF32();
   4.340 -	mParticles.mBurstSpeedMax=mBurstSpeedMaxSpinner->getValueF32();
   4.341 +	mParticles.mBurstRate = llmax(0.01f, mBurstRateSpinner->getValueF32());
   4.342 +	mParticles.mBurstPartCount = mBurstCountSpinner->getValue().asInteger();
   4.343 +	mParticles.mBurstRadius = mBurstRadiusSpinner->getValueF32();
   4.344 +	mParticles.mInnerAngle = mAngleBeginSpinner->getValueF32();
   4.345 +	mParticles.mOuterAngle = mAngleEndSpinner->getValueF32();
   4.346 +	mParticles.mBurstSpeedMin = mBurstSpeedMinSpinner->getValueF32();
   4.347 +	mParticles.mBurstSpeedMax = mBurstSpeedMaxSpinner->getValueF32();
   4.348  	mParticles.mPartData.setStartAlpha(mStartAlphaSpinner->getValueF32());
   4.349  	mParticles.mPartData.setEndAlpha(mEndAlphaSpinner->getValueF32());
   4.350 -	mParticles.mPartData.setStartScale(mScaleStartXSpinner->getValueF32(),mScaleStartYSpinner->getValueF32());
   4.351 -	mParticles.mPartData.setEndScale(mScaleEndXSpinner->getValueF32(),mScaleEndYSpinner->getValueF32());
   4.352 -	mParticles.mMaxAge=mSourceMaxAgeSpinner->getValueF32();
   4.353 +	mParticles.mPartData.setStartScale(mScaleStartXSpinner->getValueF32(), mScaleStartYSpinner->getValueF32());
   4.354 +	mParticles.mPartData.setEndScale(mScaleEndXSpinner->getValueF32(), mScaleEndYSpinner->getValueF32());
   4.355 +	mParticles.mMaxAge = mSourceMaxAgeSpinner->getValueF32();
   4.356  	mParticles.mPartData.setMaxAge(mParticlesMaxAgeSpinner->getValueF32());
   4.357  
   4.358  	// different way to set values here, ask Linden Lab why -Zi
   4.359 -	mParticles.mPartData.mStartGlow=mStartGlowSpinner->getValueF32();
   4.360 -	mParticles.mPartData.mEndGlow=mEndGlowSpinner->getValueF32();
   4.361 +	mParticles.mPartData.mStartGlow = mStartGlowSpinner->getValueF32();
   4.362 +	mParticles.mPartData.mEndGlow = mEndGlowSpinner->getValueF32();
   4.363  
   4.364 -	mParticles.mPartData.mBlendFuncSource=mBlendMap[mBlendFuncSrcCombo->getSelectedValue()];
   4.365 -	mParticles.mPartData.mBlendFuncDest=mBlendMap[mBlendFuncDestCombo->getSelectedValue()];
   4.366 +	mParticles.mPartData.mBlendFuncSource = mBlendMap[mBlendFuncSrcCombo->getSelectedValue()];
   4.367 +	mParticles.mPartData.mBlendFuncDest = mBlendMap[mBlendFuncDestCombo->getSelectedValue()];
   4.368  
   4.369 -	U32 flags=0;
   4.370 -	if(mBounceCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_BOUNCE_MASK;
   4.371 -	if(mEmissiveCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_EMISSIVE_MASK;
   4.372 -	if(mFollowSourceCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_FOLLOW_SRC_MASK;
   4.373 -	if(mFollowVelocityCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_FOLLOW_VELOCITY_MASK;
   4.374 -	if(mInterpolateColorCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_INTERP_COLOR_MASK;
   4.375 -	if(mInterpolateScaleCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_INTERP_SCALE_MASK;
   4.376 -	if(mTargetPositionCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_TARGET_POS_MASK;
   4.377 -	if(mTargetLinearCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_TARGET_LINEAR_MASK;
   4.378 -	if(mWindCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_WIND_MASK;
   4.379 -	if(mRibbonCheckBox->getValue().asBoolean()) flags|=LLPartData::LL_PART_RIBBON_MASK;
   4.380 +	U32 flags = 0;
   4.381 +	if (mBounceCheckBox->getValue().asBoolean())			flags |= LLPartData::LL_PART_BOUNCE_MASK;
   4.382 +	if (mEmissiveCheckBox->getValue().asBoolean())			flags |= LLPartData::LL_PART_EMISSIVE_MASK;
   4.383 +	if (mFollowSourceCheckBox->getValue().asBoolean())		flags |= LLPartData::LL_PART_FOLLOW_SRC_MASK;
   4.384 +	if (mFollowVelocityCheckBox->getValue().asBoolean())	flags |= LLPartData::LL_PART_FOLLOW_VELOCITY_MASK;
   4.385 +	if (mInterpolateColorCheckBox->getValue().asBoolean())	flags |= LLPartData::LL_PART_INTERP_COLOR_MASK;
   4.386 +	if (mInterpolateScaleCheckBox->getValue().asBoolean())	flags |= LLPartData::LL_PART_INTERP_SCALE_MASK;
   4.387 +	if (mTargetPositionCheckBox->getValue().asBoolean())	flags |= LLPartData::LL_PART_TARGET_POS_MASK;
   4.388 +	if (mTargetLinearCheckBox->getValue().asBoolean())		flags |= LLPartData::LL_PART_TARGET_LINEAR_MASK;
   4.389 +	if (mWindCheckBox->getValue().asBoolean())				flags |= LLPartData::LL_PART_WIND_MASK;
   4.390 +	if (mRibbonCheckBox->getValue().asBoolean())			flags |= LLPartData::LL_PART_RIBBON_MASK;
   4.391  	mParticles.mPartData.setFlags(flags);
   4.392  
   4.393 -	mParticles.mTargetUUID=mTargetKeyInput->getValue().asUUID();
   4.394 +	mParticles.mTargetUUID = mTargetKeyInput->getValue().asUUID();
   4.395  
   4.396 -	mParticles.mPartAccel=LLVector3(mAcellerationXSpinner->getValueF32(),mAcellerationYSpinner->getValueF32(),mAcellerationZSpinner->getValueF32());
   4.397 -	mParticles.mAngularVelocity=LLVector3(mOmegaXSpinner->getValueF32(),mOmegaYSpinner->getValueF32(),mOmegaZSpinner->getValueF32());
   4.398 +	mParticles.mPartAccel = LLVector3(mAcellerationXSpinner->getValueF32(), mAcellerationYSpinner->getValueF32(), mAcellerationZSpinner->getValueF32());
   4.399 +	mParticles.mAngularVelocity = LLVector3(mOmegaXSpinner->getValueF32(), mOmegaYSpinner->getValueF32(), mOmegaZSpinner->getValueF32());
   4.400  
   4.401 -	LLColor4 color=mStartColorSelector->get();
   4.402 -	mParticles.mPartData.setStartColor(LLVector3(color.mV[0],color.mV[1],color.mV[2]));
   4.403 -	color=mEndColorSelector->get();
   4.404 -	mParticles.mPartData.setEndColor(LLVector3(color.mV[0],color.mV[1],color.mV[2]));
   4.405 +	LLColor4 color = mStartColorSelector->get();
   4.406 +	mParticles.mPartData.setStartColor(LLVector3(color.mV[VX], color.mV[VY], color.mV[VZ]));
   4.407 +	color = mEndColorSelector->get();
   4.408 +	mParticles.mPartData.setEndColor(LLVector3(color.mV[VX], color.mV[VY], color.mV[VZ]));
   4.409  
   4.410  	updateUI();
   4.411  	updateParticles();
   4.412 @@ -323,20 +325,20 @@
   4.413  
   4.414  void ParticleEditor::updateUI()
   4.415  {
   4.416 -	U8 pattern=mPatternMap[mPatternTypeCombo->getValue()];
   4.417 -	BOOL dropPattern=(pattern==LLPartSysData::LL_PART_SRC_PATTERN_DROP);
   4.418 -	BOOL explodePattern=(pattern==LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE);
   4.419 -	BOOL targetLinear=mTargetLinearCheckBox->getValue();
   4.420 -	BOOL interpolateColor=mInterpolateColorCheckBox->getValue();
   4.421 -	BOOL interpolateScale=mInterpolateScaleCheckBox->getValue();
   4.422 -	BOOL targetEnabled=targetLinear | (mTargetPositionCheckBox->getValue().asBoolean() ? TRUE : FALSE);
   4.423 +	U8 pattern = mPatternMap[mPatternTypeCombo->getValue()];
   4.424 +	BOOL dropPattern = (pattern == LLPartSysData::LL_PART_SRC_PATTERN_DROP);
   4.425 +	BOOL explodePattern = (pattern == LLPartSysData::LL_PART_SRC_PATTERN_EXPLODE);
   4.426 +	BOOL targetLinear = mTargetLinearCheckBox->getValue();
   4.427 +	BOOL interpolateColor = mInterpolateColorCheckBox->getValue();
   4.428 +	BOOL interpolateScale = mInterpolateScaleCheckBox->getValue();
   4.429 +	BOOL targetEnabled = targetLinear | (mTargetPositionCheckBox->getValue().asBoolean() ? TRUE : FALSE);
   4.430  
   4.431  	mBurstRadiusSpinner->setEnabled(!(targetLinear | (mFollowSourceCheckBox->getValue().asBoolean() ? TRUE : FALSE) | dropPattern));
   4.432  	mBurstSpeedMinSpinner->setEnabled(!(targetLinear | dropPattern));
   4.433  	mBurstSpeedMaxSpinner->setEnabled(!(targetLinear | dropPattern));
   4.434  
   4.435  	// disabling a color swatch does nothing visually, so we also set alpha
   4.436 -	LLColor4 endColor=mEndColorSelector->get();
   4.437 +	LLColor4 endColor = mEndColorSelector->get();
   4.438  	endColor.setAlpha(interpolateColor ? 1.0f : 0.0f);
   4.439  
   4.440  	mEndAlphaSpinner->setEnabled(interpolateColor);
   4.441 @@ -380,38 +382,38 @@
   4.442  // static
   4.443  void ParticleEditor::startPicking(void* userdata)
   4.444  {
   4.445 -	ParticleEditor* self =(ParticleEditor*) userdata;
   4.446 -	LLToolObjPicker::getInstance()->setExitCallback(ParticleEditor::onTargetPicked,self);
   4.447 +	ParticleEditor* self = (ParticleEditor*) userdata;
   4.448 +	LLToolObjPicker::getInstance()->setExitCallback(ParticleEditor::onTargetPicked, self);
   4.449  	LLToolMgr::getInstance()->setTransientTool(LLToolObjPicker::getInstance());
   4.450  }
   4.451  
   4.452  // static
   4.453  void ParticleEditor::onTargetPicked(void* userdata)
   4.454  {
   4.455 -	ParticleEditor* self=(ParticleEditor*) userdata;
   4.456 +	ParticleEditor* self = (ParticleEditor*)userdata;
   4.457  
   4.458 -	LLUUID picked=LLToolObjPicker::getInstance()->getObjectID();
   4.459 +	LLUUID picked = LLToolObjPicker::getInstance()->getObjectID();
   4.460  
   4.461  	LLToolMgr::getInstance()->clearTransientTool();
   4.462  
   4.463  	self->mPickTargetButton->setEnabled(TRUE);
   4.464  	self->mPickTargetButton->setToggleState(FALSE);
   4.465  
   4.466 -	if(picked.notNull())
   4.467 +	if (picked.notNull())
   4.468  	{
   4.469  		self->mTargetKeyInput->setValue(picked.asString());
   4.470  		self->onParameterChange();
   4.471  	}
   4.472  }
   4.473  
   4.474 -std::string ParticleEditor::lslVector(F32 x,F32 y,F32 z)
   4.475 +std::string ParticleEditor::lslVector(F32 x, F32 y, F32 z)
   4.476  {
   4.477 -	return llformat("<%f,%f,%f>",x,y,z);
   4.478 +	return llformat("<%f,%f,%f>", x, y, z);
   4.479  }
   4.480  
   4.481  std::string ParticleEditor::lslColor(const LLColor4& color)
   4.482  {
   4.483 -	return lslVector(color.mV[0],color.mV[1],color.mV[2]);
   4.484 +	return lslVector(color.mV[VX], color.mV[VY], color.mV[VZ]);
   4.485  }
   4.486  
   4.487  std::string ParticleEditor::createScript()
   4.488 @@ -454,67 +456,71 @@
   4.489      }\n\
   4.490  }\n";
   4.491  
   4.492 -	LLUUID targetKey=mTargetKeyInput->getValue().asUUID();
   4.493 -	std::string keyString="llGetKey()";
   4.494 +	LLUUID targetKey = mTargetKeyInput->getValue().asUUID();
   4.495 +	std::string keyString = "llGetKey()";
   4.496  
   4.497 -	if(!targetKey.isNull() && targetKey!=mObject->getID())
   4.498 -		keyString="(key) \""+targetKey.asString()+"\"";
   4.499 +	if (targetKey.notNull() && targetKey != mObject->getID())
   4.500 +	{
   4.501 +		keyString="(key) \"" + targetKey.asString() + "\"";
   4.502 +	}
   4.503  
   4.504 -	LLUUID textureKey=mTexture->getID();
   4.505 +	LLUUID textureKey = mTexture->getID();
   4.506  	std::string textureString;
   4.507 -	if(!textureKey.isNull() && textureKey!=IMG_DEFAULT && textureKey!=mDefaultParticleTexture->getID())
   4.508 -		textureString=textureKey.asString();
   4.509 +	if (textureKey.notNull() && textureKey != IMG_DEFAULT && textureKey != mDefaultParticleTexture->getID())
   4.510 +	{
   4.511 +		textureString = textureKey.asString();
   4.512 +	}
   4.513  
   4.514 -	LLStringUtil::replaceString(script,"[PATTERN]",mScriptPatternMap[mPatternTypeCombo->getValue()]);
   4.515 -	LLStringUtil::replaceString(script,"[BURST_RADIUS]",mBurstRadiusSpinner->getValue().asString());
   4.516 -	LLStringUtil::replaceString(script,"[ANGLE_BEGIN]",mAngleBeginSpinner->getValue().asString());
   4.517 -	LLStringUtil::replaceString(script,"[ANGLE_END]",mAngleEndSpinner->getValue().asString());
   4.518 -	LLStringUtil::replaceString(script,"[TARGET_KEY]",keyString);
   4.519 -	LLStringUtil::replaceString(script,"[START_COLOR]",lslColor(mStartColorSelector->get()));
   4.520 -	LLStringUtil::replaceString(script,"[END_COLOR]",lslColor(mEndColorSelector->get()));
   4.521 -	LLStringUtil::replaceString(script,"[START_ALPHA]",mStartAlphaSpinner->getValue().asString());
   4.522 -	LLStringUtil::replaceString(script,"[END_ALPHA]",mEndAlphaSpinner->getValue().asString());
   4.523 -	LLStringUtil::replaceString(script,"[START_GLOW]",mStartGlowSpinner->getValue().asString());
   4.524 -	LLStringUtil::replaceString(script,"[END_GLOW]",mEndGlowSpinner->getValue().asString());
   4.525 -	LLStringUtil::replaceString(script,"[START_SCALE]",lslVector(mScaleStartXSpinner->getValueF32(),mScaleStartYSpinner->getValueF32(),0.0f));
   4.526 -	LLStringUtil::replaceString(script,"[END_SCALE]",lslVector(mScaleEndXSpinner->getValueF32(),mScaleEndYSpinner->getValueF32(),0.0f));
   4.527 -	LLStringUtil::replaceString(script,"[TEXTURE]",textureString);
   4.528 -	LLStringUtil::replaceString(script,"[SOURCE_MAX_AGE]",mSourceMaxAgeSpinner->getValue().asString());
   4.529 -	LLStringUtil::replaceString(script,"[PART_MAX_AGE]",mParticlesMaxAgeSpinner->getValue().asString());
   4.530 -	LLStringUtil::replaceString(script,"[BURST_RATE]",mBurstRateSpinner->getValue().asString());
   4.531 -	LLStringUtil::replaceString(script,"[BURST_COUNT]",mBurstCountSpinner->getValue());
   4.532 -	LLStringUtil::replaceString(script,"[ACCELERATION]",lslVector(mAcellerationXSpinner->getValueF32(),mAcellerationYSpinner->getValueF32(),mAcellerationZSpinner->getValueF32()));
   4.533 -	LLStringUtil::replaceString(script,"[OMEGA]",lslVector(mOmegaXSpinner->getValueF32(),mOmegaYSpinner->getValueF32(),mOmegaZSpinner->getValueF32()));
   4.534 -	LLStringUtil::replaceString(script,"[BURST_SPEED_MIN]",mBurstSpeedMinSpinner->getValue().asString());
   4.535 -	LLStringUtil::replaceString(script,"[BURST_SPEED_MAX]",mBurstSpeedMaxSpinner->getValue().asString());
   4.536 -	LLStringUtil::replaceString(script,"[BLEND_FUNC_SOURCE]",mScriptBlendMap[mBlendFuncSrcCombo->getValue().asString()]);
   4.537 -	LLStringUtil::replaceString(script,"[BLEND_FUNC_DEST]",mScriptBlendMap[mBlendFuncDestCombo->getValue().asString()]);
   4.538 +	LLStringUtil::replaceString(script,"[PATTERN]", mScriptPatternMap[mPatternTypeCombo->getValue()]);
   4.539 +	LLStringUtil::replaceString(script,"[BURST_RADIUS]", mBurstRadiusSpinner->getValue().asString());
   4.540 +	LLStringUtil::replaceString(script,"[ANGLE_BEGIN]", mAngleBeginSpinner->getValue().asString());
   4.541 +	LLStringUtil::replaceString(script,"[ANGLE_END]", mAngleEndSpinner->getValue().asString());
   4.542 +	LLStringUtil::replaceString(script,"[TARGET_KEY]", keyString);
   4.543 +	LLStringUtil::replaceString(script,"[START_COLOR]", lslColor(mStartColorSelector->get()));
   4.544 +	LLStringUtil::replaceString(script,"[END_COLOR]", lslColor(mEndColorSelector->get()));
   4.545 +	LLStringUtil::replaceString(script,"[START_ALPHA]", mStartAlphaSpinner->getValue().asString());
   4.546 +	LLStringUtil::replaceString(script,"[END_ALPHA]", mEndAlphaSpinner->getValue().asString());
   4.547 +	LLStringUtil::replaceString(script,"[START_GLOW]", mStartGlowSpinner->getValue().asString());
   4.548 +	LLStringUtil::replaceString(script,"[END_GLOW]", mEndGlowSpinner->getValue().asString());
   4.549 +	LLStringUtil::replaceString(script,"[START_SCALE]", lslVector(mScaleStartXSpinner->getValueF32(), mScaleStartYSpinner->getValueF32(), 0.0f));
   4.550 +	LLStringUtil::replaceString(script,"[END_SCALE]", lslVector(mScaleEndXSpinner->getValueF32(), mScaleEndYSpinner->getValueF32(), 0.0f));
   4.551 +	LLStringUtil::replaceString(script,"[TEXTURE]", textureString);
   4.552 +	LLStringUtil::replaceString(script,"[SOURCE_MAX_AGE]", mSourceMaxAgeSpinner->getValue().asString());
   4.553 +	LLStringUtil::replaceString(script,"[PART_MAX_AGE]", mParticlesMaxAgeSpinner->getValue().asString());
   4.554 +	LLStringUtil::replaceString(script,"[BURST_RATE]", mBurstRateSpinner->getValue().asString());
   4.555 +	LLStringUtil::replaceString(script,"[BURST_COUNT]", mBurstCountSpinner->getValue());
   4.556 +	LLStringUtil::replaceString(script,"[ACCELERATION]", lslVector(mAcellerationXSpinner->getValueF32(), mAcellerationYSpinner->getValueF32(), mAcellerationZSpinner->getValueF32()));
   4.557 +	LLStringUtil::replaceString(script,"[OMEGA]", lslVector(mOmegaXSpinner->getValueF32(), mOmegaYSpinner->getValueF32(), mOmegaZSpinner->getValueF32()));
   4.558 +	LLStringUtil::replaceString(script,"[BURST_SPEED_MIN]", mBurstSpeedMinSpinner->getValue().asString());
   4.559 +	LLStringUtil::replaceString(script,"[BURST_SPEED_MAX]", mBurstSpeedMaxSpinner->getValue().asString());
   4.560 +	LLStringUtil::replaceString(script,"[BLEND_FUNC_SOURCE]", mScriptBlendMap[mBlendFuncSrcCombo->getValue().asString()]);
   4.561 +	LLStringUtil::replaceString(script,"[BLEND_FUNC_DEST]", mScriptBlendMap[mBlendFuncDestCombo->getValue().asString()]);
   4.562  
   4.563 -	std::string delimiter=" |\n                ";
   4.564 +	std::string delimiter = " |\n                ";
   4.565  	std::string flagsString;
   4.566  
   4.567 -	if(mBounceCheckBox->getValue())
   4.568 -		flagsString+=delimiter+"PSYS_PART_BOUNCE_MASK";
   4.569 -	if(mEmissiveCheckBox->getValue())
   4.570 -		flagsString+=delimiter+"PSYS_PART_EMISSIVE_MASK";
   4.571 -	if(mFollowSourceCheckBox->getValue())
   4.572 -		flagsString+=delimiter+"PSYS_PART_FOLLOW_SRC_MASK";
   4.573 -	if(mFollowVelocityCheckBox->getValue())
   4.574 -		flagsString+=delimiter+"PSYS_PART_FOLLOW_VELOCITY_MASK";
   4.575 -	if(mInterpolateColorCheckBox->getValue())
   4.576 -		flagsString+=delimiter+"PSYS_PART_INTERP_COLOR_MASK";
   4.577 -	if(mInterpolateScaleCheckBox->getValue())
   4.578 -		flagsString+=delimiter+"PSYS_PART_INTERP_SCALE_MASK";
   4.579 -	if(mTargetLinearCheckBox->getValue())
   4.580 -		flagsString+=delimiter+"PSYS_PART_TARGET_LINEAR_MASK";
   4.581 -	if(mTargetPositionCheckBox->getValue())
   4.582 -		flagsString+=delimiter+"PSYS_PART_TARGET_POS_MASK";
   4.583 -	if(mWindCheckBox->getValue())
   4.584 -		flagsString+=delimiter+"PSYS_PART_WIND_MASK";
   4.585 -	if(mRibbonCheckBox->getValue())
   4.586 -		flagsString+=delimiter+"PSYS_PART_RIBBON_MASK";
   4.587 +	if (mBounceCheckBox->getValue())
   4.588 +		flagsString += delimiter + "PSYS_PART_BOUNCE_MASK";
   4.589 +	if (mEmissiveCheckBox->getValue())
   4.590 +		flagsString += delimiter + "PSYS_PART_EMISSIVE_MASK";
   4.591 +	if (mFollowSourceCheckBox->getValue())
   4.592 +		flagsString += delimiter + "PSYS_PART_FOLLOW_SRC_MASK";
   4.593 +	if (mFollowVelocityCheckBox->getValue())
   4.594 +		flagsString += delimiter + "PSYS_PART_FOLLOW_VELOCITY_MASK";
   4.595 +	if (mInterpolateColorCheckBox->getValue())
   4.596 +		flagsString += delimiter + "PSYS_PART_INTERP_COLOR_MASK";
   4.597 +	if (mInterpolateScaleCheckBox->getValue())
   4.598 +		flagsString += delimiter + "PSYS_PART_INTERP_SCALE_MASK";
   4.599 +	if (mTargetLinearCheckBox->getValue())
   4.600 +		flagsString += delimiter + "PSYS_PART_TARGET_LINEAR_MASK";
   4.601 +	if (mTargetPositionCheckBox->getValue())
   4.602 +		flagsString += delimiter + "PSYS_PART_TARGET_POS_MASK";
   4.603 +	if (mWindCheckBox->getValue())
   4.604 +		flagsString += delimiter + "PSYS_PART_WIND_MASK";
   4.605 +	if (mRibbonCheckBox->getValue())
   4.606 +		flagsString += delimiter + "PSYS_PART_RIBBON_MASK";
   4.607  
   4.608 -	LLStringUtil::replaceString(script,"[FLAGS]",flagsString);
   4.609 +	LLStringUtil::replaceString(script, "[FLAGS]", flagsString);
   4.610  	LL_DEBUGS() << "\n" << script << LL_ENDL;
   4.611  
   4.612  	return script;
   4.613 @@ -522,8 +528,8 @@
   4.614  
   4.615  void ParticleEditor::onCopyButtonClicked()
   4.616  {
   4.617 -	std::string script=createScript();
   4.618 -	if(!script.empty())
   4.619 +	std::string script = createScript();
   4.620 +	if (!script.empty())
   4.621  	{
   4.622  		getWindow()->copyTextToClipboard(utf8str_to_wstring(script));
   4.623  		LLNotificationsUtil::add("ParticleScriptCopiedToClipboard");
   4.624 @@ -536,21 +542,23 @@
   4.625  	LLUUID categoryID;
   4.626  
   4.627  	// first try to find the #Firestorm folder
   4.628 -	categoryID=gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
   4.629 +	categoryID = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER);
   4.630  
   4.631  	// if no #Firestorm folder was found, create one
   4.632 -	if(categoryID.isNull())
   4.633 -		categoryID=gInventory.createNewCategory(gInventory.getRootFolderID(),LLFolderType::FT_NONE,ROOT_FIRESTORM_FOLDER);
   4.634 +	if (categoryID.isNull())
   4.635 +	{
   4.636 +		categoryID = gInventory.createNewCategory(gInventory.getRootFolderID(), LLFolderType::FT_NONE, ROOT_FIRESTORM_FOLDER);
   4.637 +	}
   4.638  
   4.639  	// if still no #Firestorm folder was found, try to find the default "Scripts" folder
   4.640 -	if(categoryID.isNull())
   4.641 +	if (categoryID.isNull())
   4.642  	{
   4.643 -		std::string scriptFolderName=LLFolderType::lookup(LLFolderType::FT_LSL_TEXT);
   4.644 +		std::string scriptFolderName = LLFolderType::lookup(LLFolderType::FT_LSL_TEXT);
   4.645  		gInventory.findCategoryByName(scriptFolderName);
   4.646  	}
   4.647  
   4.648  	// if still no valid folder found bail out and complain
   4.649 -	if(categoryID.isNull())
   4.650 +	if (categoryID.isNull())
   4.651  	{
   4.652  		LLNotificationsUtil::add("ParticleScriptFindFolderFailed");
   4.653  		return;
   4.654 @@ -558,21 +566,21 @@
   4.655  
   4.656  	// setup permissions
   4.657  	LLPermissions perm;
   4.658 -	perm.init(gAgent.getID(),gAgent.getID(),LLUUID::null,LLUUID::null);
   4.659 -	perm.initMasks(PERM_ALL,PERM_ALL,PERM_ALL,PERM_ALL,PERM_ALL);
   4.660 +	perm.init(gAgentID, gAgentID, LLUUID::null, LLUUID::null);
   4.661 +	perm.initMasks(PERM_ALL, PERM_ALL, PERM_ALL, PERM_ALL, PERM_ALL);
   4.662  
   4.663  	// create new script inventory item and wait for it to come back (callback)
   4.664 -	LLPointer<LLInventoryCallback> callback=new ParticleScriptCreationCallback(this);
   4.665 +	LLPointer<LLInventoryCallback> callback = new ParticleScriptCreationCallback(this);
   4.666  	create_inventory_item(
   4.667 -		gAgent.getID(), 
   4.668 -		gAgent.getSessionID(),
   4.669 +		gAgentID,
   4.670 +		gAgentSessionID,
   4.671  		categoryID,
   4.672 -		LLTransactionID::tnull, 
   4.673 -		PARTICLE_SCRIPT_NAME, 
   4.674 -		"", 
   4.675 -		LLAssetType::AT_LSL_TEXT, 
   4.676 +		LLTransactionID::tnull,
   4.677 +		PARTICLE_SCRIPT_NAME,
   4.678 +		"",
   4.679 +		LLAssetType::AT_LSL_TEXT,
   4.680  		LLInventoryType::IT_LSL,
   4.681 -		NOT_WEARABLE, 
   4.682 +		NOT_WEARABLE,
   4.683  		perm.getMaskNextOwner(),
   4.684  		callback);
   4.685  
   4.686 @@ -583,34 +591,34 @@
   4.687  {
   4.688  	setCanClose(TRUE);
   4.689  
   4.690 -	if(inventoryItemID.isNull())
   4.691 +	if (inventoryItemID.isNull())
   4.692  	{
   4.693  		LLNotificationsUtil::add("ParticleScriptCreationFailed");
   4.694  		return;
   4.695  	}
   4.696  
   4.697 -	mParticleScriptInventoryItem=gInventory.getItem(inventoryItemID);
   4.698 -	if(!mParticleScriptInventoryItem) 
   4.699 +	mParticleScriptInventoryItem = gInventory.getItem(inventoryItemID);
   4.700 +	if (!mParticleScriptInventoryItem) 
   4.701  	{
   4.702  		LLNotificationsUtil::add("ParticleScriptNotFound");
   4.703  		return;
   4.704  	}
   4.705 -    gInventory.updateItem(mParticleScriptInventoryItem);
   4.706 -    gInventory.notifyObservers();
   4.707 +	gInventory.updateItem(mParticleScriptInventoryItem);
   4.708 +	gInventory.notifyObservers();
   4.709  
   4.710  	//caps import 
   4.711 -	std::string url=gAgent.getRegion()->getCapability("UpdateScriptAgent");
   4.712 +	std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgent");
   4.713  
   4.714 -	if(!url.empty())  
   4.715 +	if (!url.empty())
   4.716  	{
   4.717 -		std::string script=createScript();
   4.718 +		std::string script = createScript();
   4.719  
   4.720 -		std::string tempFileName=gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"particle_script.lsltxt");
   4.721 +		std::string tempFileName = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, "particle_script.lsltxt");
   4.722  
   4.723  		std::ofstream tempFile;
   4.724  
   4.725  		tempFile.open(tempFileName.c_str());
   4.726 -		if(!tempFile.is_open())
   4.727 +		if (!tempFile.is_open())
   4.728  		{
   4.729  			LLNotificationsUtil::add("ParticleScriptCreateTempFileFailed");
   4.730  			return;
   4.731 @@ -620,13 +628,13 @@
   4.732  		tempFile.close();
   4.733  
   4.734  		LLSD body;
   4.735 -		body["task_id"]=mObject->getID();	// probably has no effect
   4.736 -		body["item_id"]=inventoryItemID;
   4.737 -		body["target"]="mono";
   4.738 -		body["is_script_running"]=true;
   4.739 +		body["task_id"] = mObject->getID();	// probably has no effect
   4.740 +		body["item_id"] = inventoryItemID;
   4.741 +		body["target"] = "mono";
   4.742 +		body["is_script_running"] = true;
   4.743  
   4.744  		// responder will alert us when the job is done
   4.745 -		LLHTTPClient::post(url,body,new ParticleScriptUploadResponder(body,tempFileName,LLAssetType::AT_LSL_TEXT,this));
   4.746 +		LLHTTPClient::post(url, body, new ParticleScriptUploadResponder(body, tempFileName, LLAssetType::AT_LSL_TEXT, this));
   4.747  
   4.748  		mMainPanel->setEnabled(FALSE);
   4.749  		setCanClose(FALSE);
   4.750 @@ -643,15 +651,15 @@
   4.751  	setCanClose(TRUE);
   4.752  
   4.753  	// play it safe, because some time may have passed
   4.754 -	LLViewerObject* object=gObjectList.findObject(mObject->getID());
   4.755 -	if(!object)
   4.756 +	LLViewerObject* object = gObjectList.findObject(mObject->getID());
   4.757 +	if (!object)
   4.758  	{
   4.759  		LL_DEBUGS() << "object went away!" << LL_ENDL;
   4.760  		mMainPanel->setEnabled(TRUE);
   4.761  		return;
   4.762  	}
   4.763  
   4.764 -	mObject->saveScript(mParticleScriptInventoryItem,TRUE,FALSE);
   4.765 +	mObject->saveScript(mParticleScriptInventoryItem, TRUE, FALSE);
   4.766  	LLNotificationsUtil::add("ParticleScriptInjected");
   4.767  
   4.768  	delete this;
   4.769 @@ -661,7 +669,7 @@
   4.770  
   4.771  ParticleScriptCreationCallback::ParticleScriptCreationCallback(ParticleEditor* editor)
   4.772  {
   4.773 -	mEditor=editor;
   4.774 +	mEditor = editor;
   4.775  }
   4.776  
   4.777  ParticleScriptCreationCallback::~ParticleScriptCreationCallback()
   4.778 @@ -680,9 +688,9 @@
   4.779  															 LLAssetType::EType asset_type,
   4.780  															 ParticleEditor* editor
   4.781  															) :
   4.782 -	LLUpdateAgentInventoryResponder(post_data,file_name,asset_type)
   4.783 +	LLUpdateAgentInventoryResponder(post_data, file_name, asset_type)
   4.784  {
   4.785 -	mEditor=editor;
   4.786 +	mEditor = editor;
   4.787  }
   4.788  
   4.789  void ParticleScriptUploadResponder::uploadComplete(const LLSD& content)
     5.1 --- a/indra/newview/particleeditor.h	Mon Jan 05 10:32:05 2015 +0100
     5.2 +++ b/indra/newview/particleeditor.h	Mon Jan 05 13:02:24 2015 +0100
     5.3 @@ -72,7 +72,7 @@
     5.4  		void callbackReturned(const LLUUID& inv_item);
     5.5  		void scriptInjectReturned(const LLSD& content);
     5.6  
     5.7 -		std::string lslVector(F32 x,F32 y,F32 z);
     5.8 +		std::string lslVector(F32 x, F32 y, F32 z);
     5.9  		std::string lslColor(const LLColor4& color);
    5.10  
    5.11  		LLViewerObject* mObject;
    5.12 @@ -83,11 +83,11 @@
    5.13  
    5.14  		LLPartSysData mParticles;
    5.15  
    5.16 -		std::map<std::string,U8> mPatternMap;
    5.17 -		std::map<std::string,std::string> mScriptPatternMap;
    5.18 +		std::map<std::string, U8> mPatternMap;
    5.19 +		std::map<std::string, std::string> mScriptPatternMap;
    5.20  
    5.21 -		std::map<std::string,U8> mBlendMap;
    5.22 -		std::map<std::string,std::string> mScriptBlendMap;
    5.23 +		std::map<std::string, U8> mBlendMap;
    5.24 +		std::map<std::string, std::string> mScriptBlendMap;
    5.25  
    5.26  		LLPanel* mMainPanel;
    5.27  
     6.1 --- a/indra/newview/sanitycheck.cpp	Mon Jan 05 10:32:05 2015 +0100
     6.2 +++ b/indra/newview/sanitycheck.cpp	Mon Jan 05 13:02:24 2015 +0100
     6.3 @@ -44,9 +44,9 @@
     6.4  		f(SanityCheck* s) : chk(s) {};
     6.5  		virtual void apply(const std::string& name, LLControlVariable* control)
     6.6  		{
     6.7 -			if(control->getSanityType()!=SANITY_TYPE_NONE)
     6.8 +			if (control->getSanityType() != SANITY_TYPE_NONE)
     6.9  			{
    6.10 -				control->getSanitySignal()->connect(boost::bind(&SanityCheck::onSanity,_1));
    6.11 +				control->getSanitySignal()->connect(boost::bind(&SanityCheck::onSanity, _1));
    6.12  				SanityCheck::instance().onSanity(control);
    6.13  			}
    6.14  		}
    6.15 @@ -59,26 +59,26 @@
    6.16  // static
    6.17  void SanityCheck::onSanity(LLControlVariable* controlp)
    6.18  {
    6.19 -	static LLControlVariable* lastControl=NULL;
    6.20 +	static LLControlVariable* lastControl = NULL;
    6.21  
    6.22 -	if(controlp->isSane())
    6.23 +	if (controlp->isSane())
    6.24  		return;
    6.25  
    6.26 -	if(controlp==lastControl)
    6.27 +	if (controlp == lastControl)
    6.28  		return;
    6.29  
    6.30 -	lastControl=controlp;
    6.31 +	lastControl = controlp;
    6.32  
    6.33 -	std::string checkType="SanityCheck"+gSavedSettings.sanityTypeEnumToString(controlp->getSanityType());
    6.34 -	std::vector<LLSD> sanityValues=controlp->getSanityValues();
    6.35 +	std::string checkType = "SanityCheck" + gSavedSettings.sanityTypeEnumToString(controlp->getSanityType());
    6.36 +	std::vector<LLSD> sanityValues = controlp->getSanityValues();
    6.37  
    6.38  	LLSD args;
    6.39  	LLStringUtil::format_map_t map;
    6.40 -	map["VALUE_1"]=sanityValues[0].asString();
    6.41 -	map["VALUE_2"]=sanityValues[1].asString();
    6.42 -	map["CONTROL_NAME"]=controlp->getName();
    6.43 -	args["SANITY_MESSAGE"]=LLTrans::getString(checkType,map);
    6.44 -	args["SANITY_COMMENT"]=controlp->getSanityComment();
    6.45 -	args["CURRENT_VALUE"]=controlp->getValue().asString();
    6.46 -	LLNotificationsUtil::add("SanityCheck",args);
    6.47 +	map["VALUE_1"] = sanityValues[0].asString();
    6.48 +	map["VALUE_2"] = sanityValues[1].asString();
    6.49 +	map["CONTROL_NAME"] = controlp->getName();
    6.50 +	args["SANITY_MESSAGE"] = LLTrans::getString(checkType,map);
    6.51 +	args["SANITY_COMMENT"] = controlp->getSanityComment();
    6.52 +	args["CURRENT_VALUE"] = controlp->getValue().asString();
    6.53 +	LLNotificationsUtil::add("SanityCheck", args);
    6.54  }

mercurial