diff --git a/indra/newview/particleeditor.cpp b/indra/newview/particleeditor.cpp index 817d25d03a..a54ccd9b7b 100644 --- a/indra/newview/particleeditor.cpp +++ b/indra/newview/particleeditor.cpp @@ -38,7 +38,6 @@ #include "lllineeditor.h" #include "llnotificationsutil.h" #include "llpermissions.h" -#include "llsd.h" #include "llspinctrl.h" #include "lltexturectrl.h" #include "lltoolmgr.h" @@ -48,7 +47,6 @@ #include "llviewerpartsource.h" #include "llviewerregion.h" #include "llwindow.h" -#include "v4math.h" ParticleEditor::ParticleEditor(const LLSD& key) : LLFloater(key), @@ -99,68 +97,66 @@ ParticleEditor::~ParticleEditor() BOOL ParticleEditor::postBuild() { - LLPanel* panel = getChild("particle_editor_panel"); + mMainPanel = getChild("particle_editor_panel"); - mMainPanel = panel; + mPatternTypeCombo = mMainPanel->getChild("pattern_type_combo"); + mTexturePicker = mMainPanel->getChild("texture_picker"); - mPatternTypeCombo = panel->getChild("pattern_type_combo"); - mTexturePicker = panel->getChild("texture_picker"); + mBurstRateSpinner = mMainPanel->getChild("burst_rate_spinner"); + mBurstCountSpinner = mMainPanel->getChild("burst_count_spinner"); + mBurstRadiusSpinner = mMainPanel->getChild("burst_radius_spinner"); + mAngleBeginSpinner = mMainPanel->getChild("angle_begin_spinner"); + mAngleEndSpinner = mMainPanel->getChild("angle_end_spinner"); + mBurstSpeedMinSpinner = mMainPanel->getChild("burst_speed_min_spinner"); + mBurstSpeedMaxSpinner = mMainPanel->getChild("burst_speed_max_spinner"); + mStartAlphaSpinner = mMainPanel->getChild("start_alpha_spinner"); + mEndAlphaSpinner = mMainPanel->getChild("end_alpha_spinner"); + mScaleStartXSpinner = mMainPanel->getChild("scale_start_x_spinner"); + mScaleStartYSpinner = mMainPanel->getChild("scale_start_y_spinner"); + mScaleEndXSpinner = mMainPanel->getChild("scale_end_x_spinner"); + mScaleEndYSpinner = mMainPanel->getChild("scale_end_y_spinner"); + mSourceMaxAgeSpinner = mMainPanel->getChild("source_max_age_spinner"); + mParticlesMaxAgeSpinner = mMainPanel->getChild("particles_max_age_spinner"); + mStartGlowSpinner = mMainPanel->getChild("start_glow_spinner"); + mEndGlowSpinner = mMainPanel->getChild("end_glow_spinner"); - mBurstRateSpinner = panel->getChild("burst_rate_spinner"); - mBurstCountSpinner = panel->getChild("burst_count_spinner"); - mBurstRadiusSpinner = panel->getChild("burst_radius_spinner"); - mAngleBeginSpinner = panel->getChild("angle_begin_spinner"); - mAngleEndSpinner = panel->getChild("angle_end_spinner"); - mBurstSpeedMinSpinner = panel->getChild("burst_speed_min_spinner"); - mBurstSpeedMaxSpinner = panel->getChild("burst_speed_max_spinner"); - mStartAlphaSpinner = panel->getChild("start_alpha_spinner"); - mEndAlphaSpinner = panel->getChild("end_alpha_spinner"); - mScaleStartXSpinner = panel->getChild("scale_start_x_spinner"); - mScaleStartYSpinner = panel->getChild("scale_start_y_spinner"); - mScaleEndXSpinner = panel->getChild("scale_end_x_spinner"); - mScaleEndYSpinner = panel->getChild("scale_end_y_spinner"); - mSourceMaxAgeSpinner = panel->getChild("source_max_age_spinner"); - mParticlesMaxAgeSpinner = panel->getChild("particles_max_age_spinner"); - mStartGlowSpinner = panel->getChild("start_glow_spinner"); - mEndGlowSpinner = panel->getChild("end_glow_spinner"); + mBlendFuncSrcCombo = mMainPanel->getChild("blend_func_src_combo"); + mBlendFuncDestCombo = mMainPanel->getChild("blend_func_dest_combo"); - mBlendFuncSrcCombo = panel->getChild("blend_func_src_combo"); - mBlendFuncDestCombo = panel->getChild("blend_func_dest_combo"); + mBounceCheckBox = mMainPanel->getChild("bounce_checkbox"); + mEmissiveCheckBox = mMainPanel->getChild("emissive_checkbox"); + mFollowSourceCheckBox = mMainPanel->getChild("follow_source_checkbox"); + mFollowVelocityCheckBox = mMainPanel->getChild("follow_velocity_checkbox"); + mInterpolateColorCheckBox = mMainPanel->getChild("interpolate_color_checkbox"); + mInterpolateScaleCheckBox = mMainPanel->getChild("interpolate_scale_checkbox"); + mTargetPositionCheckBox = mMainPanel->getChild("target_position_checkbox"); + mTargetLinearCheckBox = mMainPanel->getChild("target_linear_checkbox"); + mWindCheckBox = mMainPanel->getChild("wind_checkbox"); + mRibbonCheckBox = mMainPanel->getChild("ribbon_checkbox"); - mBounceCheckBox = panel->getChild("bounce_checkbox"); - mEmissiveCheckBox = panel->getChild("emissive_checkbox"); - mFollowSourceCheckBox = panel->getChild("follow_source_checkbox"); - mFollowVelocityCheckBox = panel->getChild("follow_velocity_checkbox"); - mInterpolateColorCheckBox = panel->getChild("interpolate_color_checkbox"); - mInterpolateScaleCheckBox = panel->getChild("interpolate_scale_checkbox"); - mTargetPositionCheckBox = panel->getChild("target_position_checkbox"); - mTargetLinearCheckBox = panel->getChild("target_linear_checkbox"); - mWindCheckBox = panel->getChild("wind_checkbox"); - mRibbonCheckBox = panel->getChild("ribbon_checkbox"); + mTargetKeyInput = mMainPanel->getChild("target_key_input"); - mTargetKeyInput = panel->getChild("target_key_input"); + mAcellerationXSpinner = mMainPanel->getChild("acceleration_x_spinner"); + mAcellerationYSpinner = mMainPanel->getChild("acceleration_y_spinner"); + mAcellerationZSpinner = mMainPanel->getChild("acceleration_z_spinner"); - mAcellerationXSpinner = panel->getChild("acceleration_x_spinner"); - mAcellerationYSpinner = panel->getChild("acceleration_y_spinner"); - mAcellerationZSpinner = panel->getChild("acceleration_z_spinner"); + mOmegaXSpinner = mMainPanel->getChild("omega_x_spinner"); + mOmegaYSpinner = mMainPanel->getChild("omega_y_spinner"); + mOmegaZSpinner = mMainPanel->getChild("omega_z_spinner"); - mOmegaXSpinner = panel->getChild("omega_x_spinner"); - mOmegaYSpinner = panel->getChild("omega_y_spinner"); - mOmegaZSpinner = panel->getChild("omega_z_spinner"); + mStartColorSelector = mMainPanel->getChild("start_color_selector"); + mEndColorSelector = mMainPanel->getChild("end_color_selector"); - mStartColorSelector = panel->getChild("start_color_selector"); - mEndColorSelector = panel->getChild("end_color_selector"); - - mCopyToLSLButton = panel->getChild("copy_button"); + mCopyToLSLButton = mMainPanel->getChild("copy_button"); mCopyToLSLButton->setCommitCallback(boost::bind(&ParticleEditor::onCopyButtonClicked, this)); - mInjectScriptButton = panel->getChild("inject_button"); + mInjectScriptButton = mMainPanel->getChild("inject_button"); mInjectScriptButton->setCommitCallback(boost::bind(&ParticleEditor::onInjectButtonClicked, this)); - mClearTargetButton = panel->getChild("clear_target_button"); + mClearTargetButton = mMainPanel->getChild("clear_target_button"); mClearTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onClearTargetButtonClicked, this)); - mPickTargetButton = panel->getChild("pick_target_button"); + mPickTargetButton = mMainPanel->getChild("pick_target_button"); mPickTargetButton->setCommitCallback(boost::bind(&ParticleEditor::onTargetPickerButtonClicked, this)); mPatternTypeCombo->setCommitCallback(boost::bind(&ParticleEditor::onParameterChange, this)); @@ -536,11 +532,8 @@ void ParticleEditor::onCopyButtonClicked() void ParticleEditor::onInjectButtonClicked() { - // TODO: move searching and creating the #Firestorm folder into a helper class for all to use - LLUUID categoryID; - // first try to find the #Firestorm folder - categoryID = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER); + LLUUID categoryID = gInventory.findCategoryByName(ROOT_FIRESTORM_FOLDER); // if no #Firestorm folder was found, create one if (categoryID.isNull()) diff --git a/indra/newview/particleeditor.h b/indra/newview/particleeditor.h index 5b1631cbce..45f1310e48 100644 --- a/indra/newview/particleeditor.h +++ b/indra/newview/particleeditor.h @@ -22,7 +22,6 @@ #ifndef PARTICLEEDITOR_H #define PARTICLEEDITOR_H -#include "v4color.h" #include "llfloater.h" #include "llpartdata.h" #include "llviewerinventory.h" diff --git a/indra/newview/piemenu.cpp b/indra/newview/piemenu.cpp index 28d43dde08..d5b6b666df 100644 --- a/indra/newview/piemenu.cpp +++ b/indra/newview/piemenu.cpp @@ -585,6 +585,6 @@ F32 PieMenu::getScaleFactor() // setRect(r); // obsolete? } - return factor; #endif -} \ No newline at end of file + return factor; +}