diff --git a/indra/llaudio/llvorbisdecode.cpp b/indra/llaudio/llvorbisdecode.cpp index 4bf70f41f..8055be96c 100644 --- a/indra/llaudio/llvorbisdecode.cpp +++ b/indra/llaudio/llvorbisdecode.cpp @@ -133,10 +133,10 @@ BOOL decode_vorbis_file(LLVFS *vfs, const LLUUID &in_uuid, char *out_fname) return(FALSE); } - //********************************** + // ********************************** LLAPRFile outfile ; outfile.open(out_fname,LL_APR_WPB); - //********************************** + // ********************************** if (!outfile.getFileHandle()) { llwarning("unable to open vorbis destination file for writing",0); @@ -308,9 +308,9 @@ BOOL decode_vorbis_file(LLVFS *vfs, const LLUUID &in_uuid, char *out_fname) outfile.seek(SEEK_END,-fade_length*2); outfile.write(pcmout,2*fade_length); //write back xfaded last 16 samples - //******************* + // ******************* outfile.close(); - //******************* + // ******************* if ((36 == data_length) || (!(eof))) { diff --git a/indra/llaudio/llvorbisencode.cpp b/indra/llaudio/llvorbisencode.cpp index 2fcaf97a8..8682664b6 100644 --- a/indra/llaudio/llvorbisencode.cpp +++ b/indra/llaudio/llvorbisencode.cpp @@ -87,10 +87,10 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro error_msg.clear(); - //******************************** + // ******************************** LLAPRFile infile ; infile.open(in_fname,LL_APR_RB); - //******************************** + // ******************************** if (!infile.getFileHandle()) { error_msg = "CannotUploadSoundFile"; @@ -159,9 +159,9 @@ S32 check_for_invalid_wav_formats(const std::string& in_fname, std::string& erro file_pos += (chunk_length + 8); chunk_length = 0; } - //**************** + // **************** infile.close(); - //**************** + // **************** if (!uncompressed_pcm) { diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index ab2f87275..3b7dbec33 100644 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -637,9 +637,9 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty motionp->fadeIn(); } - //********************** + // ********************** // MOTION INACTIVE - //********************** + // ********************** if (motionp->isStopped() && mAnimTime > motionp->getStopTime() + motionp->getEaseOutDuration()) { // this motion has gone on too long, deactivate it @@ -659,9 +659,9 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty } } - //********************** + // ********************** // MOTION EASE OUT - //********************** + // ********************** else if (motionp->isStopped() && mAnimTime > motionp->getStopTime()) { // is this the first iteration in the ease out phase? @@ -684,9 +684,9 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty update_result = motionp->onUpdate(mAnimTime - motionp->mActivationTimestamp, last_joint_signature); } - //********************** + // ********************** // MOTION ACTIVE - //********************** + // ********************** else if (mAnimTime > motionp->mActivationTimestamp + motionp->getEaseInDuration()) { posep->setWeight(motionp->getFadeWeight()); @@ -707,9 +707,9 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty update_result = motionp->onUpdate(mAnimTime - motionp->mActivationTimestamp, last_joint_signature); } - //********************** + // ********************** // MOTION EASE IN - //********************** + // ********************** else if (mAnimTime >= motionp->mActivationTimestamp) { if (mLastTime < motionp->mActivationTimestamp) diff --git a/indra/llcommon/doublelinkedlist.h b/indra/llcommon/doublelinkedlist.h index a87860cf3..f8aa9df80 100644 --- a/indra/llcommon/doublelinkedlist.h +++ b/indra/llcommon/doublelinkedlist.h @@ -124,7 +124,7 @@ public: // NOTE: This next two funtions are only included here // for those too familiar with the LLLinkedList template class. - // They are depreciated. resetList() is unecessary while + // They are deprecated. resetList() is unecessary while // getCurrentData() is identical to getNextData() and has // a misleading name. // @@ -604,7 +604,7 @@ BOOL LLDoubleLinkedList::checkData(const DATA_TYPE *data) // NOTE: This next two funtions are only included here // for those too familiar with the LLLinkedList template class. -// They are depreciated. resetList() is unecessary while +// They are deprecated. resetList() is unecessary while // getCurrentData() is identical to getNextData() and has // a misleading name. // diff --git a/indra/llcommon/llapr.cpp b/indra/llcommon/llapr.cpp index 32b189ff6..ee7717f12 100644 --- a/indra/llcommon/llapr.cpp +++ b/indra/llcommon/llapr.cpp @@ -249,7 +249,7 @@ S32 LLAPRFile::seek(apr_seek_where_t where, S32 offset) } // -//******************************************************************************************************************************* +// ******************************************************************************************************************************* //static components of LLAPRFile // @@ -504,5 +504,5 @@ bool LLAPRFile::removeDir(const std::string& dirname) } // //end of static components of LLAPRFile -//******************************************************************************************************************************* +// ******************************************************************************************************************************* // diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h index 7b6696034..e7c3c53f1 100644 --- a/indra/llcommon/llapr.h +++ b/indra/llcommon/llapr.h @@ -168,7 +168,7 @@ public: apr_file_t* getFileHandle() {return mFile;} // -//******************************************************************************************************************************* +// ******************************************************************************************************************************* //static components // private: @@ -185,7 +185,7 @@ public: // Returns bytes read/written, 0 if read/write fails: static S32 readEx(const std::string& filename, void *buf, S32 offset, S32 nbytes); static S32 writeEx(const std::string& filename, void *buf, S32 offset, S32 nbytes); -//******************************************************************************************************************************* +// ******************************************************************************************************************************* }; /** diff --git a/indra/llcommon/llerrorlegacy.h b/indra/llcommon/llerrorlegacy.h index 476d75380..fa41c5b3d 100644 --- a/indra/llcommon/llerrorlegacy.h +++ b/indra/llcommon/llerrorlegacy.h @@ -107,7 +107,14 @@ const int LL_ERR_PRICE_MISMATCH = -23018; #define llwarning(msg, num) llwarns << "Warning # " << num << ": " << msg << llendl; -#define llassert_always(func) if (LL_UNLIKELY(!(func))) llerrs << "ASSERT (" << #func << ")" << llendl; +#define liru_slashpos std::string(__FILE__).find_last_of("/\\") +#define liru_slashpos2 std::string(__FILE__).substr(0,liru_slashpos).find_last_of("/\\") +#define liru_assert_strip /*strip path down to lastlevel directory and filename for assert.*/\ + (liru_slashpos == std::string::npos ? std::string(__FILE__)/*just filename, print as is*/\ + : liru_slashpos2 == std::string::npos ? std::string(__FILE__)/*Apparently, we're in / or perhaps the top of the drive, print as is*/\ + : std::string(__FILE__).substr(1+liru_slashpos2))/*print foo/bar.cpp or perhaps foo\bar.cpp*/ + +#define llassert_always(func) if (LL_UNLIKELY(!(func))) llerrs <<"\nASSERT(" #func ")\nfile:"<mPath.size() * mProfilep->mProfile.size()) > (1u << 20)) { @@ -2194,7 +2194,7 @@ BOOL LLVolume::generate() llerrs << "LLVolume corrupted!" << llendl ; } - //******************************************************************** + // ******************************************************************** BOOL regenPath = mPathp->generate(mParams.getPathParams(), path_detail, split); BOOL regenProf = mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(),profile_detail, split); @@ -2204,7 +2204,7 @@ BOOL LLVolume::generate() S32 sizeS = mPathp->mPath.size(); S32 sizeT = mProfilep->mProfile.size(); - //******************************************************************** + // ******************************************************************** //debug info, to be removed if((U32)(sizeS * sizeT) > (1u << 20)) { @@ -2217,7 +2217,7 @@ BOOL LLVolume::generate() llerrs << "LLVolume corrupted!" << llendl ; } - //******************************************************************** + // ******************************************************************** sNumMeshPoints -= mMesh.size(); mMesh.resize(sizeT * sizeS); diff --git a/indra/llmessage/llclassifiedflags.cpp b/indra/llmessage/llclassifiedflags.cpp index da608e490..f827f4b34 100644 --- a/indra/llmessage/llclassifiedflags.cpp +++ b/indra/llmessage/llclassifiedflags.cpp @@ -30,13 +30,13 @@ * $/LicenseInfo$ */ -//***************************************************************************** +// ***************************************************************************** // llclassifiedflags.cpp // // Some exported symbols and functions for dealing with classified flags. // // Copyright 2005, Linden Research, Inc -//***************************************************************************** +// ***************************************************************************** #include "linden_common.h" diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 1f06135a8..dee90dd5b 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -395,7 +395,7 @@ U32 LLCurl::Easy::report(CURLcode code) if (code == CURLE_OK) { check_curl_code(curl_easy_getinfo(mCurlEasyHandle, CURLINFO_RESPONSE_CODE, &responseCode)); - //*TODO: get reason from first line of mHeaderOutput + // *TODO: get reason from first line of mHeaderOutput } else { @@ -715,7 +715,7 @@ S32 LLCurl::Multi::process() else { response = 499; - //*TODO: change to llwarns + // *TODO: change to llwarns llerrs << "cleaned up curl request completed!" << llendl; } if (response >= 400) diff --git a/indra/llprimitive/lltreeparams.h b/indra/llprimitive/lltreeparams.h index 9ca2c81ec..9644c6312 100644 --- a/indra/llprimitive/lltreeparams.h +++ b/indra/llprimitive/lltreeparams.h @@ -84,25 +84,25 @@ public: // LOBING - //*! number of peaks in the radial distance about the perimeter + // *! number of peaks in the radial distance about the perimeter U8 mLobes; // even numbers = obvius symmetry ... use odd numbers - //*! magnitude of the variations as a fraction of the radius + // *! magnitude of the variations as a fraction of the radius F32 mLobeDepth; // FLARE - //*! causes exponential expansion near base of trunk + // *! causes exponential expansion near base of trunk F32 mFlare; // scales radius base by min 1 to '1 + flare' - //*! percentage of the height of the trunk to flair -- likely less than baseSize + // *! percentage of the height of the trunk to flair -- likely less than baseSize F32 mFlarePercentage; - //*! number of cross sections to make for the flair + // *! number of cross sections to make for the flair U8 mFlareRes; @@ -140,7 +140,7 @@ public: //!~ ratio and ratiopower determine radius/length F32 mRatio, mRatioPower; - //*! taper of branches + // *! taper of branches F32 mTaper[MAX_NUM_LEVELS]; // 0 - non-tapering cylinder // 1 - taper to a point @@ -154,10 +154,10 @@ public: F32 mSplitAngleV[MAX_NUM_LEVELS]; //~ variance of the splits // CURVE - F32 mCurve[MAX_NUM_LEVELS]; //* general, 1-axis, overall curve of branch - F32 mCurveV[MAX_NUM_LEVELS]; //* curve variance at each cross section from general overall curve - U8 mCurveRes[MAX_NUM_LEVELS]; //* number of cross sections for curve - F32 mCurveBack[MAX_NUM_LEVELS]; //* curveback is amount branch curves back towards + F32 mCurve[MAX_NUM_LEVELS]; // * general, 1-axis, overall curve of branch + F32 mCurveV[MAX_NUM_LEVELS]; // * curve variance at each cross section from general overall curve + U8 mCurveRes[MAX_NUM_LEVELS]; // * number of cross sections for curve + F32 mCurveBack[MAX_NUM_LEVELS]; // * curveback is amount branch curves back towards // vertices per cross section U8 mVertices[MAX_NUM_LEVELS]; diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 17da07381..9cb9a2dcd 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -65,9 +65,9 @@ LLImageGL* LLImageGL::sDefaultGLTexture = NULL ; std::set LLImageGL::sImageList; -//**************************************************************************************************** +// **************************************************************************************************** //The below for texture auditing use only -//**************************************************************************************************** +// **************************************************************************************************** //----------------------- //debug use BOOL gAuditTexture = FALSE ; @@ -84,11 +84,11 @@ std::vector LLImageGL::sTextureMemByCategory; std::vector LLImageGL::sTextureMemByCategoryBound ; std::vector LLImageGL::sTextureCurMemByCategoryBound ; //------------------------ -//**************************************************************************************************** +// **************************************************************************************************** //End for texture auditing use only -//**************************************************************************************************** +// **************************************************************************************************** -//************************************************************************************** +// ************************************************************************************** //below are functions for debug use //do not delete them even though they are not currently being used. void check_all_images() @@ -167,7 +167,7 @@ void LLImageGL::checkTexSize(bool forced) const } } //end of debug functions -//************************************************************************************** +// ************************************************************************************** //---------------------------------------------------------------------------- BOOL is_little_endian() diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h index cc36b7a74..a472c6262 100644 --- a/indra/llrender/llimagegl.h +++ b/indra/llrender/llimagegl.h @@ -257,9 +257,9 @@ private: //can be removed if we do not use that function at all. static BOOL sAllowReadBackRaw ; // -//**************************************************************************************************** +// **************************************************************************************************** //The below for texture auditing use only -//**************************************************************************************************** +// **************************************************************************************************** private: S32 mCategory ; public: @@ -290,9 +290,9 @@ public: static std::vector sTextureMemByCategoryBound ; static std::vector sTextureCurMemByCategoryBound ; //---------------------------------------- -//**************************************************************************************************** +// **************************************************************************************************** //End of definitions for texture auditing use only -//**************************************************************************************************** +// **************************************************************************************************** }; diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp index ee06d32b9..25e775c1e 100644 --- a/indra/llrender/llpostprocess.cpp +++ b/indra/llrender/llpostprocess.cpp @@ -105,7 +105,7 @@ LLPostProcess::LLPostProcess(void) : } setSelectedEffect("default"); - //*/ + // */ } LLPostProcess::~LLPostProcess(void) diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp index 144732525..507414958 100644 --- a/indra/llui/llcombobox.cpp +++ b/indra/llui/llcombobox.cpp @@ -700,7 +700,7 @@ void LLComboBox::hideList() #if 0 // Don't do this! mTextEntry->getText() can be truncated, in which case selectItemByLabel // fails and this only resets the selection :/ - //*HACK: store the original value explicitly somewhere, not just in label + // *HACK: store the original value explicitly somewhere, not just in label std::string orig_selection = mAllowTextEntry ? mTextEntry->getText() : mButton->getLabelSelected(); // assert selection in list diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index fccddcb79..90a633a8e 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1663,7 +1663,7 @@ void LLFloater::updateButtons() mButtons[i]->setEnabled(mButtonsEnabled[i]); if (mButtonsEnabled[i] - //*HACK: always render close button for hosted floaters + // *HACK: always render close button for hosted floaters // so that users don't accidentally hit the button when closing multiple windows // in the chatterbox || (i == BUTTON_CLOSE && mButtonScale != 1.f)) diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index de6d988b2..9b60fbaaa 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -30,7 +30,7 @@ * $/LicenseInfo$ */ -//***************************************************************************** +// ***************************************************************************** // // This file contains the opengl based menu implementation. // @@ -39,7 +39,7 @@ // column is used for displaying boolean values for toggle and check // controls. The right column is used for submenus. // -//***************************************************************************** +// ***************************************************************************** //#include "llviewerprecompiledheaders.h" #include "linden_common.h" diff --git a/indra/llui/llpanel.cpp b/indra/llui/llpanel.cpp index adeb437c9..cc0b9faf5 100644 --- a/indra/llui/llpanel.cpp +++ b/indra/llui/llpanel.cpp @@ -623,7 +623,7 @@ std::string LLPanel::getString(const std::string& name, const LLStringUtil::form formatted_string.setArgList(args); return formatted_string.getString(); } - std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate + std::string err_str("Failed to find string " + name + " in panel " + getName()); // *TODO: Translate // *TODO: once the QAR-369 ui-cleanup work on settings is in we need to change the following line to be //if(LLUI::sConfigGroup->getBOOL("QAMode")) if(LLUI::sQAMode) @@ -644,7 +644,7 @@ std::string LLPanel::getString(const std::string& name) const { return found_it->second; } - std::string err_str("Failed to find string " + name + " in panel " + getName()); //*TODO: Translate + std::string err_str("Failed to find string " + name + " in panel " + getName()); // *TODO: Translate if(LLUI::sQAMode) { llerrs << err_str << llendl; diff --git a/indra/llui/llradiogroup.cpp b/indra/llui/llradiogroup.cpp index 5f5a2acd8..5c715d3ff 100644 --- a/indra/llui/llradiogroup.cpp +++ b/indra/llui/llradiogroup.cpp @@ -47,11 +47,9 @@ static LLRegisterWidget r("radio_group"); LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect, - const std::string& control_name, - LLUICtrlCallback callback, - void* userdata, - BOOL border) -: LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP), + const std::string& control_name, LLUICtrlCallback callback, + void* userdata, BOOL border) : + LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP), mSelectedIndex(0) { setControlName(control_name, NULL); @@ -59,10 +57,8 @@ LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect, } LLRadioGroup::LLRadioGroup(const std::string& name, const LLRect& rect, - S32 initial_index, - LLUICtrlCallback callback, - void* userdata, - BOOL border) : + S32 initial_index, LLUICtrlCallback callback, + void* userdata, BOOL border) : LLUICtrl(name, rect, TRUE, callback, userdata, FOLLOWS_LEFT | FOLLOWS_TOP), mSelectedIndex(initial_index) { @@ -74,10 +70,8 @@ void LLRadioGroup::init(BOOL border) if (border) { addChild( new LLViewBorder( std::string("radio group border"), - LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), - LLViewBorder::BEVEL_NONE, - LLViewBorder::STYLE_LINE, - 1 ) ); + LLRect(0, getRect().getHeight(), getRect().getWidth(), 0), + LLViewBorder::BEVEL_NONE, LLViewBorder::STYLE_LINE, 1 )); } mHasBorder = border; } @@ -257,8 +251,7 @@ void LLRadioGroup::draw() LLRadioCtrl* LLRadioGroup::addRadioButton(const std::string& name, const std::string& label, const LLRect& rect, const LLFontGL* font ) { // Highlight will get fixed in draw method above - LLRadioCtrl* radio = new LLRadioCtrl(name, rect, label, font, - onClickButton, this); + LLRadioCtrl* radio = new LLRadioCtrl(name, rect, label, font, onClickButton, this); addChild(radio); mRadioButtons.push_back(radio); return radio; diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 02f11c9b7..e356d3c44 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -299,7 +299,7 @@ S32 LLScrollListSeparator::getHeight() const void LLScrollListSeparator::draw(const LLColor4& color, const LLColor4& highlight_color) const { - //*FIXME: use dynamic item heights and make separators narrow, and inactive + // *FIXME: use dynamic item heights and make separators narrow, and inactive gl_line_2d(5, 8, llmax(5, getWidth() - 5), 8, color); } diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index a33da9dea..db9caf8c0 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -2658,9 +2658,9 @@ U32 LLXMLNode::getChildCount() const return 0; } -//*************************************************** +// *************************************************** // UNIT TESTING -//*************************************************** +// *************************************************** U32 get_rand(U32 max_value) { diff --git a/indra/newview/app_settings/keys.ini b/indra/newview/app_settings/keys.ini index b79e5bf50..2cdc5e8d9 100644 --- a/indra/newview/app_settings/keys.ini +++ b/indra/newview/app_settings/keys.ini @@ -23,13 +23,13 @@ FIRST_PERSON E NONE jump FIRST_PERSON C NONE push_down FIRST_PERSON F NONE toggle_fly -FIRST_PERSON LEFT NONE slide_left -FIRST_PERSON RIGHT NONE slide_right +FIRST_PERSON LEFT NONE slide_left +FIRST_PERSON RIGHT NONE slide_right FIRST_PERSON UP NONE push_forward -FIRST_PERSON DOWN NONE push_backward -FIRST_PERSON PGUP NONE jump -FIRST_PERSON PGDN NONE push_down -FIRST_PERSON HOME NONE toggle_fly +FIRST_PERSON DOWN NONE push_backward +FIRST_PERSON PGUP NONE jump +FIRST_PERSON PGDN NONE push_down +FIRST_PERSON HOME NONE toggle_fly FIRST_PERSON PAD_LEFT NONE slide_left FIRST_PERSON PAD_RIGHT NONE slide_right @@ -47,26 +47,26 @@ FIRST_PERSON D SHIFT slide_right FIRST_PERSON W SHIFT push_forward FIRST_PERSON S SHIFT push_backward FIRST_PERSON E SHIFT jump -FIRST_PERSON C SHIFT push_down +FIRST_PERSON C SHIFT toggle_down FIRST_PERSON F SHIFT toggle_fly -FIRST_PERSON SPACE NONE stop_moving -FIRST_PERSON ENTER NONE start_chat -FIRST_PERSON DIVIDE NONE start_gesture +FIRST_PERSON SPACE NONE stop_moving +FIRST_PERSON ENTER NONE start_chat +FIRST_PERSON DIVIDE NONE start_gesture -FIRST_PERSON LEFT SHIFT slide_left -FIRST_PERSON RIGHT SHIFT slide_right +FIRST_PERSON LEFT SHIFT slide_left +FIRST_PERSON RIGHT SHIFT slide_right FIRST_PERSON UP SHIFT push_forward -FIRST_PERSON DOWN SHIFT push_backward -FIRST_PERSON PGUP SHIFT jump -FIRST_PERSON PGDN SHIFT push_down +FIRST_PERSON DOWN SHIFT push_backward +FIRST_PERSON PGUP SHIFT jump +FIRST_PERSON PGDN SHIFT toggle_down FIRST_PERSON PAD_LEFT SHIFT slide_left FIRST_PERSON PAD_RIGHT SHIFT slide_right FIRST_PERSON PAD_UP SHIFT push_forward FIRST_PERSON PAD_DOWN SHIFT push_backward FIRST_PERSON PAD_PGUP SHIFT jump -FIRST_PERSON PAD_PGDN SHIFT push_down +FIRST_PERSON PAD_PGDN SHIFT toggle_down FIRST_PERSON PAD_HOME SHIFT toggle_fly FIRST_PERSON PAD_ENTER SHIFT start_chat FIRST_PERSON PAD_DIVIDE SHIFT start_gesture @@ -82,29 +82,29 @@ THIRD_PERSON S SHIFT push_backward THIRD_PERSON E NONE jump THIRD_PERSON C NONE push_down THIRD_PERSON E SHIFT jump -THIRD_PERSON C SHIFT push_down +THIRD_PERSON C SHIFT toggle_down THIRD_PERSON F NONE toggle_fly THIRD_PERSON F SHIFT toggle_fly -THIRD_PERSON SPACE NONE stop_moving -THIRD_PERSON ENTER NONE start_chat -THIRD_PERSON DIVIDE NONE start_gesture +THIRD_PERSON SPACE NONE stop_moving +THIRD_PERSON ENTER NONE start_chat +THIRD_PERSON DIVIDE NONE start_gesture -THIRD_PERSON LEFT NONE turn_left -THIRD_PERSON LEFT SHIFT slide_left -THIRD_PERSON RIGHT NONE turn_right -THIRD_PERSON RIGHT SHIFT slide_right +THIRD_PERSON LEFT NONE turn_left +THIRD_PERSON LEFT SHIFT slide_left +THIRD_PERSON RIGHT NONE turn_right +THIRD_PERSON RIGHT SHIFT slide_right THIRD_PERSON UP NONE push_forward -THIRD_PERSON DOWN NONE push_backward +THIRD_PERSON DOWN NONE push_backward THIRD_PERSON UP SHIFT push_forward -THIRD_PERSON DOWN SHIFT push_backward -THIRD_PERSON PGUP NONE jump -THIRD_PERSON PGDN NONE push_down -THIRD_PERSON PGUP SHIFT jump -THIRD_PERSON PGDN SHIFT push_down -THIRD_PERSON HOME SHIFT toggle_fly -THIRD_PERSON HOME NONE toggle_fly +THIRD_PERSON DOWN SHIFT push_backward +THIRD_PERSON PGUP NONE jump +THIRD_PERSON PGDN NONE push_down +THIRD_PERSON PGUP SHIFT jump +THIRD_PERSON PGDN SHIFT toggle_down +THIRD_PERSON HOME SHIFT toggle_fly +THIRD_PERSON HOME NONE toggle_fly THIRD_PERSON PAD_LEFT NONE turn_left THIRD_PERSON PAD_LEFT SHIFT slide_left @@ -117,7 +117,7 @@ THIRD_PERSON PAD_DOWN SHIFT push_backward THIRD_PERSON PAD_PGUP NONE jump THIRD_PERSON PAD_PGDN NONE push_down THIRD_PERSON PAD_PGUP SHIFT jump -THIRD_PERSON PAD_PGDN SHIFT push_down +THIRD_PERSON PAD_PGDN SHIFT toggle_down THIRD_PERSON PAD_HOME NONE toggle_fly THIRD_PERSON PAD_HOME SHIFT toggle_fly THIRD_PERSON PAD_CENTER NONE stop_moving @@ -128,52 +128,52 @@ THIRD_PERSON PAD_DIVIDE NONE start_gesture THIRD_PERSON PAD_DIVIDE SHIFT start_gesture # Camera controls in third person on Alt -THIRD_PERSON LEFT ALT spin_around_cw -THIRD_PERSON RIGHT ALT spin_around_ccw -THIRD_PERSON UP ALT move_forward -THIRD_PERSON DOWN ALT move_backward -THIRD_PERSON PGUP ALT spin_over -THIRD_PERSON PGDN ALT spin_under +THIRD_PERSON LEFT ALT spin_around_cw +THIRD_PERSON RIGHT ALT spin_around_ccw +THIRD_PERSON UP ALT move_forward +THIRD_PERSON DOWN ALT move_backward +THIRD_PERSON PGUP ALT spin_over +THIRD_PERSON PGDN ALT spin_under -THIRD_PERSON A ALT spin_around_cw -THIRD_PERSON D ALT spin_around_ccw -THIRD_PERSON W ALT move_forward -THIRD_PERSON S ALT move_backward -THIRD_PERSON E ALT spin_over -THIRD_PERSON C ALT spin_under +THIRD_PERSON A ALT spin_around_cw +THIRD_PERSON D ALT spin_around_ccw +THIRD_PERSON W ALT move_forward +THIRD_PERSON S ALT move_backward +THIRD_PERSON E ALT spin_over +THIRD_PERSON C ALT spin_under -THIRD_PERSON PAD_LEFT ALT spin_around_cw -THIRD_PERSON PAD_RIGHT ALT spin_around_ccw -THIRD_PERSON PAD_UP ALT move_forward -THIRD_PERSON PAD_DOWN ALT move_backward -THIRD_PERSON PAD_PGUP ALT spin_over -THIRD_PERSON PAD_PGDN ALT spin_under -THIRD_PERSON PAD_ENTER ALT start_chat -THIRD_PERSON PAD_DIVIDE ALT start_gesture +THIRD_PERSON PAD_LEFT ALT spin_around_cw +THIRD_PERSON PAD_RIGHT ALT spin_around_ccw +THIRD_PERSON PAD_UP ALT move_forward +THIRD_PERSON PAD_DOWN ALT move_backward +THIRD_PERSON PAD_PGUP ALT spin_over +THIRD_PERSON PAD_PGDN ALT spin_under +THIRD_PERSON PAD_ENTER ALT start_chat +THIRD_PERSON PAD_DIVIDE ALT start_gesture # mimic alt zoom behavior with keyboard only -THIRD_PERSON A CTL_ALT spin_around_cw -THIRD_PERSON D CTL_ALT spin_around_ccw -THIRD_PERSON W CTL_ALT spin_over -THIRD_PERSON S CTL_ALT spin_under -THIRD_PERSON E CTL_ALT spin_over -THIRD_PERSON C CTL_ALT spin_under +THIRD_PERSON A CTL_ALT spin_around_cw +THIRD_PERSON D CTL_ALT spin_around_ccw +THIRD_PERSON W CTL_ALT spin_over +THIRD_PERSON S CTL_ALT spin_under +THIRD_PERSON E CTL_ALT spin_over +THIRD_PERSON C CTL_ALT spin_under -THIRD_PERSON LEFT CTL_ALT spin_around_cw -THIRD_PERSON RIGHT CTL_ALT spin_around_ccw -THIRD_PERSON UP CTL_ALT spin_over -THIRD_PERSON DOWN CTL_ALT spin_under -THIRD_PERSON PGUP CTL_ALT spin_over -THIRD_PERSON PGDN CTL_ALT spin_under +THIRD_PERSON LEFT CTL_ALT spin_around_cw +THIRD_PERSON RIGHT CTL_ALT spin_around_ccw +THIRD_PERSON UP CTL_ALT spin_over +THIRD_PERSON DOWN CTL_ALT spin_under +THIRD_PERSON PGUP CTL_ALT spin_over +THIRD_PERSON PGDN CTL_ALT spin_under -THIRD_PERSON PAD_LEFT CTL_ALT spin_around_cw -THIRD_PERSON PAD_RIGHT CTL_ALT spin_around_ccw -THIRD_PERSON PAD_UP CTL_ALT spin_over -THIRD_PERSON PAD_DOWN CTL_ALT spin_under -THIRD_PERSON PAD_PGUP CTL_ALT spin_over -THIRD_PERSON PAD_PGDN CTL_ALT spin_under -THIRD_PERSON PAD_ENTER CTL_ALT start_chat -THIRD_PERSON PAD_DIVIDE CTL_ALT start_gesture +THIRD_PERSON PAD_LEFT CTL_ALT spin_around_cw +THIRD_PERSON PAD_RIGHT CTL_ALT spin_around_ccw +THIRD_PERSON PAD_UP CTL_ALT spin_over +THIRD_PERSON PAD_DOWN CTL_ALT spin_under +THIRD_PERSON PAD_PGUP CTL_ALT spin_over +THIRD_PERSON PAD_PGDN CTL_ALT spin_under +THIRD_PERSON PAD_ENTER CTL_ALT start_chat +THIRD_PERSON PAD_DIVIDE CTL_ALT start_gesture # Therefore pan on Alt-Shift THIRD_PERSON A CTL_ALT_SHIFT pan_left @@ -181,10 +181,10 @@ THIRD_PERSON D CTL_ALT_SHIFT pan_right THIRD_PERSON W CTL_ALT_SHIFT pan_up THIRD_PERSON S CTL_ALT_SHIFT pan_down -THIRD_PERSON LEFT CTL_ALT_SHIFT pan_left -THIRD_PERSON RIGHT CTL_ALT_SHIFT pan_right +THIRD_PERSON LEFT CTL_ALT_SHIFT pan_left +THIRD_PERSON RIGHT CTL_ALT_SHIFT pan_right THIRD_PERSON UP CTL_ALT_SHIFT pan_up -THIRD_PERSON DOWN CTL_ALT_SHIFT pan_down +THIRD_PERSON DOWN CTL_ALT_SHIFT pan_down THIRD_PERSON PAD_LEFT CTL_ALT_SHIFT pan_left THIRD_PERSON PAD_RIGHT CTL_ALT_SHIFT pan_right @@ -194,164 +194,164 @@ THIRD_PERSON PAD_ENTER CTL_ALT_SHIFT start_chat THIRD_PERSON PAD_DIVIDE CTL_ALT_SHIFT start_gesture # Basic editing camera control -EDIT A NONE spin_around_cw -EDIT D NONE spin_around_ccw -EDIT W NONE move_forward -EDIT S NONE move_backward -EDIT E NONE spin_over -EDIT C NONE spin_under -EDIT ENTER NONE start_chat -EDIT DIVIDE NONE start_gesture -EDIT PAD_ENTER NONE start_chat -EDIT PAD_DIVIDE NONE start_gesture +EDIT A NONE spin_around_cw +EDIT D NONE spin_around_ccw +EDIT W NONE move_forward +EDIT S NONE move_backward +EDIT E NONE spin_over +EDIT C NONE spin_under +EDIT ENTER NONE start_chat +EDIT DIVIDE NONE start_gesture +EDIT PAD_ENTER NONE start_chat +EDIT PAD_DIVIDE NONE start_gesture -EDIT LEFT NONE spin_around_cw -EDIT RIGHT NONE spin_around_ccw -EDIT UP NONE move_forward -EDIT DOWN NONE move_backward -EDIT PGUP NONE spin_over -EDIT PGDN NONE spin_under +EDIT LEFT NONE spin_around_cw +EDIT RIGHT NONE spin_around_ccw +EDIT UP NONE move_forward +EDIT DOWN NONE move_backward +EDIT PGUP NONE spin_over +EDIT PGDN NONE spin_under -EDIT A SHIFT pan_left -EDIT D SHIFT pan_right -EDIT W SHIFT pan_up -EDIT S SHIFT pan_down +EDIT A SHIFT pan_left +EDIT D SHIFT pan_right +EDIT W SHIFT pan_up +EDIT S SHIFT pan_down -EDIT LEFT SHIFT pan_left -EDIT RIGHT SHIFT pan_right -EDIT UP SHIFT pan_up -EDIT DOWN SHIFT pan_down +EDIT LEFT SHIFT pan_left +EDIT RIGHT SHIFT pan_right +EDIT UP SHIFT pan_up +EDIT DOWN SHIFT pan_down # Walking works with ALT held down. -EDIT A ALT slide_left -EDIT D ALT slide_right -EDIT W ALT push_forward -EDIT S ALT push_backward -EDIT E ALT jump -EDIT C ALT push_down +EDIT A ALT slide_left +EDIT D ALT slide_right +EDIT W ALT push_forward +EDIT S ALT push_backward +EDIT E ALT jump +EDIT C ALT push_down -EDIT LEFT ALT slide_left -EDIT RIGHT ALT slide_right -EDIT UP ALT push_forward -EDIT DOWN ALT push_backward -EDIT PGUP ALT jump -EDIT PGDN ALT push_down -EDIT HOME ALT toggle_fly +EDIT LEFT ALT slide_left +EDIT RIGHT ALT slide_right +EDIT UP ALT push_forward +EDIT DOWN ALT push_backward +EDIT PGUP ALT jump +EDIT PGDN ALT push_down +EDIT HOME ALT toggle_fly -EDIT PAD_LEFT ALT slide_left -EDIT PAD_RIGHT ALT slide_right -EDIT PAD_UP ALT push_forward -EDIT PAD_DOWN ALT push_backward -EDIT PAD_PGUP ALT jump -EDIT PAD_PGDN ALT push_down -EDIT PAD_ENTER ALT start_chat -EDIT PAD_DIVIDE ALT start_gesture +EDIT PAD_LEFT ALT slide_left +EDIT PAD_RIGHT ALT slide_right +EDIT PAD_UP ALT push_forward +EDIT PAD_DOWN ALT push_backward +EDIT PAD_PGUP ALT jump +EDIT PAD_PGDN ALT push_down +EDIT PAD_ENTER ALT start_chat +EDIT PAD_DIVIDE ALT start_gesture -SITTING A ALT spin_around_cw -SITTING D ALT spin_around_ccw -SITTING W ALT move_forward -SITTING S ALT move_backward -SITTING E ALT spin_over_sitting -SITTING C ALT spin_under_sitting +SITTING A ALT spin_around_cw +SITTING D ALT spin_around_ccw +SITTING W ALT move_forward +SITTING S ALT move_backward +SITTING E ALT spin_over_sitting +SITTING C ALT spin_under_sitting -SITTING LEFT ALT spin_around_cw -SITTING RIGHT ALT spin_around_ccw -SITTING UP ALT move_forward -SITTING DOWN ALT move_backward -SITTING PGUP ALT spin_over -SITTING PGDN ALT spin_under +SITTING LEFT ALT spin_around_cw +SITTING RIGHT ALT spin_around_ccw +SITTING UP ALT move_forward +SITTING DOWN ALT move_backward +SITTING PGUP ALT spin_over +SITTING PGDN ALT spin_under -SITTING A CTL_ALT spin_around_cw -SITTING D CTL_ALT spin_around_ccw -SITTING W CTL_ALT spin_over -SITTING S CTL_ALT spin_under -SITTING E CTL_ALT spin_over -SITTING C CTL_ALT spin_under +SITTING A CTL_ALT spin_around_cw +SITTING D CTL_ALT spin_around_ccw +SITTING W CTL_ALT spin_over +SITTING S CTL_ALT spin_under +SITTING E CTL_ALT spin_over +SITTING C CTL_ALT spin_under -SITTING LEFT CTL_ALT spin_around_cw -SITTING RIGHT CTL_ALT spin_around_ccw -SITTING UP CTL_ALT spin_over -SITTING DOWN CTL_ALT spin_under -SITTING PGUP CTL_ALT spin_over -SITTING PGDN CTL_ALT spin_under +SITTING LEFT CTL_ALT spin_around_cw +SITTING RIGHT CTL_ALT spin_around_ccw +SITTING UP CTL_ALT spin_over +SITTING DOWN CTL_ALT spin_under +SITTING PGUP CTL_ALT spin_over +SITTING PGDN CTL_ALT spin_under -SITTING A NONE spin_around_cw_sitting -SITTING D NONE spin_around_ccw_sitting -SITTING W NONE move_forward_sitting -SITTING S NONE move_backward_sitting -SITTING E NONE spin_over_sitting -SITTING C NONE spin_under_sitting +SITTING A NONE spin_around_cw_sitting +SITTING D NONE spin_around_ccw_sitting +SITTING W NONE move_forward_sitting +SITTING S NONE move_backward_sitting +SITTING E NONE spin_over_sitting +SITTING C NONE spin_under_sitting -SITTING LEFT NONE spin_around_cw_sitting -SITTING RIGHT NONE spin_around_ccw_sitting -SITTING UP NONE move_forward_sitting -SITTING DOWN NONE move_backward_sitting -SITTING PGUP NONE spin_over_sitting -SITTING PGDN NONE spin_under_sitting +SITTING LEFT NONE spin_around_cw_sitting +SITTING RIGHT NONE spin_around_ccw_sitting +SITTING UP NONE move_forward_sitting +SITTING DOWN NONE move_backward_sitting +SITTING PGUP NONE spin_over_sitting +SITTING PGDN NONE spin_under_sitting -SITTING PAD_LEFT NONE spin_around_cw_sitting -SITTING PAD_RIGHT NONE spin_around_ccw_sitting -SITTING PAD_UP NONE move_forward_sitting -SITTING PAD_DOWN NONE move_backward_sitting -SITTING PAD_PGUP NONE spin_over_sitting -SITTING PAD_PGDN NONE spin_under_sitting -SITTING PAD_CENTER NONE stop_moving -SITTING PAD_ENTER NONE start_chat -SITTING PAD_DIVIDE NONE start_gesture +SITTING PAD_LEFT NONE spin_around_cw_sitting +SITTING PAD_RIGHT NONE spin_around_ccw_sitting +SITTING PAD_UP NONE move_forward_sitting +SITTING PAD_DOWN NONE move_backward_sitting +SITTING PAD_PGUP NONE spin_over_sitting +SITTING PAD_PGDN NONE spin_under_sitting +SITTING PAD_CENTER NONE stop_moving +SITTING PAD_ENTER NONE start_chat +SITTING PAD_DIVIDE NONE start_gesture # these are for passing controls when sitting on vehicles -SITTING A SHIFT slide_left -SITTING D SHIFT slide_right -SITTING LEFT SHIFT slide_left -SITTING RIGHT SHIFT slide_right +SITTING A SHIFT slide_left +SITTING D SHIFT slide_right +SITTING LEFT SHIFT slide_left +SITTING RIGHT SHIFT slide_right -SITTING PAD_LEFT SHIFT slide_left -SITTING PAD_RIGHT SHIFT slide_right -SITTING PAD_ENTER SHIFT start_chat -SITTING PAD_DIVIDE SHIFT start_gesture +SITTING PAD_LEFT SHIFT slide_left +SITTING PAD_RIGHT SHIFT slide_right +SITTING PAD_ENTER SHIFT start_chat +SITTING PAD_DIVIDE SHIFT start_gesture # pan on Alt-Shift -SITTING A CTL_ALT_SHIFT pan_left -SITTING D CTL_ALT_SHIFT pan_right -SITTING W CTL_ALT_SHIFT pan_up -SITTING S CTL_ALT_SHIFT pan_down +SITTING A CTL_ALT_SHIFT pan_left +SITTING D CTL_ALT_SHIFT pan_right +SITTING W CTL_ALT_SHIFT pan_up +SITTING S CTL_ALT_SHIFT pan_down -SITTING LEFT CTL_ALT_SHIFT pan_left -SITTING RIGHT CTL_ALT_SHIFT pan_right -SITTING UP CTL_ALT_SHIFT pan_up -SITTING DOWN CTL_ALT_SHIFT pan_down +SITTING LEFT CTL_ALT_SHIFT pan_left +SITTING RIGHT CTL_ALT_SHIFT pan_right +SITTING UP CTL_ALT_SHIFT pan_up +SITTING DOWN CTL_ALT_SHIFT pan_down -SITTING PAD_LEFT CTL_ALT_SHIFT pan_left -SITTING PAD_RIGHT CTL_ALT_SHIFT pan_right -SITTING PAD_UP CTL_ALT_SHIFT pan_up -SITTING PAD_DOWN CTL_ALT_SHIFT pan_down -SITTING PAD_ENTER CTL_ALT_SHIFT start_chat -SITTING PAD_DIVIDE CTL_ALT_SHIFT start_gesture +SITTING PAD_LEFT CTL_ALT_SHIFT pan_left +SITTING PAD_RIGHT CTL_ALT_SHIFT pan_right +SITTING PAD_UP CTL_ALT_SHIFT pan_up +SITTING PAD_DOWN CTL_ALT_SHIFT pan_down +SITTING PAD_ENTER CTL_ALT_SHIFT start_chat +SITTING PAD_DIVIDE CTL_ALT_SHIFT start_gesture -SITTING ENTER NONE start_chat -SITTING DIVIDE NONE start_gesture +SITTING ENTER NONE start_chat +SITTING DIVIDE NONE start_gesture # Avatar editing camera controls -EDIT_AVATAR A NONE edit_avatar_spin_cw -EDIT_AVATAR D NONE edit_avatar_spin_ccw -EDIT_AVATAR W NONE edit_avatar_move_forward -EDIT_AVATAR S NONE edit_avatar_move_backward -EDIT_AVATAR E NONE edit_avatar_spin_over -EDIT_AVATAR C NONE edit_avatar_spin_under -EDIT_AVATAR LEFT NONE edit_avatar_spin_cw -EDIT_AVATAR RIGHT NONE edit_avatar_spin_ccw -EDIT_AVATAR UP NONE edit_avatar_move_forward -EDIT_AVATAR DOWN NONE edit_avatar_move_backward -EDIT_AVATAR PGUP NONE edit_avatar_spin_over -EDIT_AVATAR PGDN NONE edit_avatar_spin_under -EDIT_AVATAR ENTER NONE start_chat -EDIT_AVATAR DIVIDE NONE start_gesture -EDIT_AVATAR PAD_LEFT NONE edit_avatar_spin_cw -EDIT_AVATAR PAD_RIGHT NONE edit_avatar_spin_ccw -EDIT_AVATAR PAD_UP NONE edit_avatar_move_forward -EDIT_AVATAR PAD_DOWN NONE edit_avatar_move_backward -EDIT_AVATAR PAD_PGUP NONE edit_avatar_spin_over -EDIT_AVATAR PAD_PGDN NONE edit_avatar_spin_under -EDIT_AVATAR PAD_ENTER NONE start_chat -EDIT_AVATAR PAD_DIVIDE NONE start_gesture +EDIT_AVATAR A NONE edit_avatar_spin_cw +EDIT_AVATAR D NONE edit_avatar_spin_ccw +EDIT_AVATAR W NONE edit_avatar_move_forward +EDIT_AVATAR S NONE edit_avatar_move_backward +EDIT_AVATAR E NONE edit_avatar_spin_over +EDIT_AVATAR C NONE edit_avatar_spin_under +EDIT_AVATAR LEFT NONE edit_avatar_spin_cw +EDIT_AVATAR RIGHT NONE edit_avatar_spin_ccw +EDIT_AVATAR UP NONE edit_avatar_move_forward +EDIT_AVATAR DOWN NONE edit_avatar_move_backward +EDIT_AVATAR PGUP NONE edit_avatar_spin_over +EDIT_AVATAR PGDN NONE edit_avatar_spin_under +EDIT_AVATAR ENTER NONE start_chat +EDIT_AVATAR DIVIDE NONE start_gesture +EDIT_AVATAR PAD_LEFT NONE edit_avatar_spin_cw +EDIT_AVATAR PAD_RIGHT NONE edit_avatar_spin_ccw +EDIT_AVATAR PAD_UP NONE edit_avatar_move_forward +EDIT_AVATAR PAD_DOWN NONE edit_avatar_move_backward +EDIT_AVATAR PAD_PGUP NONE edit_avatar_spin_over +EDIT_AVATAR PAD_PGDN NONE edit_avatar_spin_under +EDIT_AVATAR PAD_ENTER NONE start_chat +EDIT_AVATAR PAD_DIVIDE NONE start_gesture diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index f6b8670a1..c432e3a4b 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -69,6 +69,7 @@ #include "llviewercontrol.h" #include "llviewerdisplay.h" #include "llviewerjoystick.h" +#include "llviewerkeyboard.h" //For crouch toggle #include "llviewermediafocus.h" #include "llviewermenu.h" #include "llviewerobjectlist.h" @@ -438,7 +439,7 @@ void LLAgent::moveUp(S32 direction) setControlFlags(AGENT_CONTROL_UP_NEG | AGENT_CONTROL_FAST_UP); } - gAgentCamera.resetView(); + if (!isCrouch) gAgentCamera.resetView(); } //----------------------------------------------------------------------------- @@ -1215,7 +1216,7 @@ void LLAgent::setAFK() gAwayTimer.start(); if (gAFKMenu) { - //*TODO:Translate + // *TODO:Translate gAFKMenu->setLabel(std::string("Set Not Away")); } } @@ -1241,7 +1242,7 @@ void LLAgent::clearAFK() LL_INFOS("AFK") << "Clearing Away" << LL_ENDL; if (gAFKMenu) { - //*TODO:Translate + // *TODO:Translate gAFKMenu->setLabel(std::string("Set Away")); } } @@ -1264,7 +1265,7 @@ void LLAgent::setBusy() mIsBusy = TRUE; if (gBusyMenu) { - //*TODO:Translate + // *TODO:Translate gBusyMenu->setLabel(std::string("Set Not Busy")); } LLFloaterMute::getInstance()->updateButtons(); @@ -1279,7 +1280,7 @@ void LLAgent::clearBusy() sendAnimationRequest(ANIM_AGENT_BUSY, ANIM_REQUEST_STOP); if (gBusyMenu) { - //*TODO:Translate + // *TODO:Translate gBusyMenu->setLabel(std::string("Set Busy")); } LLFloaterMute::getInstance()->updateButtons(); diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 2c87d27b7..846edf8d4 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -156,7 +156,7 @@ public: public: void getName(std::string& name); //Legacy void buildFullname(std::string &name) const; //Legacy - //*TODO remove, is not used as of August 20, 2009 + // *TODO remove, is not used as of August 20, 2009 void buildFullnameAndTitle(std::string &name) const; //-------------------------------------------------------------------- diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 23a8025f3..ed43400df 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1098,6 +1098,8 @@ bool LLAppViewer::mainLoop() && !gFocusMgr.focusLocked()) { joystick->scanJoystick(); + if(isCrouch) + gAgent.moveUp(-1); gKeyboard->scanKeyboard(); } @@ -2002,7 +2004,7 @@ bool LLAppViewer::initConfiguration() } #endif - //*FIX:Mani - Set default to disabling watchdog mainloop + // *FIX:Mani - Set default to disabling watchdog mainloop // timeout for mac and linux. There is no call stack info // on these platform to help debug. #ifndef LL_RELEASE_FOR_DOWNLOAD @@ -2403,7 +2405,7 @@ bool LLAppViewer::initConfiguration() void LLAppViewer::checkForCrash(void) { #if LL_SEND_CRASH_REPORTS - //*NOTE:Mani The current state of the crash handler has the MacOSX + // *NOTE:Mani The current state of the crash handler has the MacOSX // sending all crash reports as freezes, in order to let // the MacOSX CrashRepoter generate stacks before spawning the // SL crash logger. diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp index 27d35c6bb..282f9f842 100644 --- a/indra/newview/llfloateractivespeakers.cpp +++ b/indra/newview/llfloateractivespeakers.cpp @@ -123,7 +123,7 @@ void LLSpeaker::onAvatarNameLookup(const LLUUID& id, const LLAvatarName& avatar_ // Also set the legacy name. We will need it to initiate a new // IM session. - speaker_ptr->mLegacyName = avatar_name.getLegacyName(); + speaker_ptr->mLegacyName = LLCacheName::cleanFullName(avatar_name.getLegacyName()); // [/Ansariel: Display name support] // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g) | Added: RLVa-1.0.0g diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp index 6f640b4c9..398b4a846 100644 --- a/indra/newview/llfloateravatarlist.cpp +++ b/indra/newview/llfloateravatarlist.cpp @@ -878,15 +878,12 @@ void LLFloaterAvatarList::onClickIM(void* userdata) // Single avatar LLUUID agent_id = ids[0]; - char buffer[MAX_STRING]; // [Ansariel: Display name support] - // snprintf(buffer, MAX_STRING, "%s", avlist->mAvatars[agent_id].getName().c_str()); LLAvatarName avatar_name; if (LLAvatarNameCache::get(agent_id, &avatar_name)) { - snprintf(buffer, MAX_STRING, "%s", avatar_name.getLegacyName().c_str()); gIMMgr->setFloaterOpen(TRUE); - gIMMgr->addSession(buffer,IM_NOTHING_SPECIAL,agent_id); + gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id); } // [Ansariel: Display name support] } diff --git a/indra/newview/llfloatercustomize.cpp b/indra/newview/llfloatercustomize.cpp index 2a768f631..ac42bfce2 100644 --- a/indra/newview/llfloatercustomize.cpp +++ b/indra/newview/llfloatercustomize.cpp @@ -82,7 +82,7 @@ using namespace LLVOAvatarDefines; -//*TODO:translate : The ui xml for this really needs to be integrated with the appearance paramaters +// *TODO:translate : The ui xml for this really needs to be integrated with the appearance paramaters // Globals LLFloaterCustomize* gFloaterCustomize = NULL; diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp index 03eaa4ac5..28c79d928 100644 --- a/indra/newview/llfloaterfriends.cpp +++ b/indra/newview/llfloaterfriends.cpp @@ -914,7 +914,7 @@ void LLPanelFriends::onClickIM(void* user_data) if (info && LLAvatarNameCache::get(agent_id, &avatar_name)) { gIMMgr->setFloaterOpen(TRUE); - gIMMgr->addSession(avatar_name.getLegacyName(),IM_NOTHING_SPECIAL,agent_id); + gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id); } // [/Ansariel: Display name support] } diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index 9eff1a2c4..fd78d69bc 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -84,9 +84,9 @@ const F32 SECONDS_BETWEEN_UPDATE_REQUESTS = 5.0f; static LLFloaterGodTools* sGodTools = NULL; -//***************************************************************************** +// ***************************************************************************** // LLFloaterGodTools -//***************************************************************************** +// ***************************************************************************** // static LLFloaterGodTools* LLFloaterGodTools::instance() @@ -398,9 +398,9 @@ void LLFloaterGodTools::sendGodUpdateRegionInfo() } } -//***************************************************************************** +// ***************************************************************************** // LLPanelRegionTools -//***************************************************************************** +// ***************************************************************************** // || Region |______________________________________ @@ -876,9 +876,9 @@ void LLPanelRegionTools::onSelectRegion(void* userdata) } -//***************************************************************************** +// ***************************************************************************** // Class LLPanelGridTools -//***************************************************************************** +// ***************************************************************************** // || Grid |_____________________________________ // | | @@ -1001,9 +1001,9 @@ bool LLPanelGridTools::flushMapVisibilityCachesConfirm(const LLSD& notification, } -//***************************************************************************** +// ***************************************************************************** // LLPanelObjectTools -//***************************************************************************** +// ***************************************************************************** // || Object |_______________________________________________________ diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 424b0eee8..53f30735e 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -3186,7 +3186,7 @@ LLModelPreview::~LLModelPreview() mModelLoader->mPreview = NULL; mModelLoader = NULL; } - //*HACK : *TODO : turn this back on when we understand why this crashes + // *HACK : *TODO : turn this back on when we understand why this crashes //glodShutdown(); } diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index 2f236ac07..021a5d5f0 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -336,7 +336,7 @@ void LLVoiceCallCapResponder::result(const LLSD& content) LLVoiceChannel* channelp = LLVoiceChannel::getChannelByID(mSessionID); if (channelp) { - //*TODO: DEBUG SPAM + // *TODO: DEBUG SPAM LLSD::map_const_iterator iter; for(iter = content.beginMap(); iter != content.endMap(); ++iter) { @@ -746,7 +746,7 @@ void LLVoiceChannelGroup::setChannelInfo( } else { - //*TODO: notify user + // *TODO: notify user llwarns << "Received invalid credentials for channel " << mSessionName << llendl; deactivate(); } diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index 4ef930a41..474c98ec2 100644 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -188,9 +188,9 @@ public: std::string mCantViewAccountsText; }; -//******************************************* -//** LLPanelGroupLandMoney::impl Functions ** -//******************************************* +// ******************************************* +// ** LLPanelGroupLandMoney::impl Functions ** +// ******************************************* LLPanelGroupLandMoney::impl::impl(LLPanelGroupLandMoney& panel, const LLUUID& group_id) : mPanel(panel), mGroupID(group_id) @@ -485,9 +485,9 @@ void LLPanelGroupLandMoney::impl::processGroupLand(LLMessageSystem* msg) } } -//************************************* -//** LLPanelGroupLandMoney Functions ** -//************************************* +// ************************************* +// ** LLPanelGroupLandMoney Functions ** +// ************************************* //static void* LLPanelGroupLandMoney::createTab(void* data) @@ -794,9 +794,9 @@ void LLPanelGroupLandMoney::processPlacesReply(LLMessageSystem* msg, void**) selfp->mImplementationp->processGroupLand(msg); } -//************************************************* -//** LLGroupMoneyTabEventHandler::impl Functions ** -//************************************************* +// ************************************************* +// ** LLGroupMoneyTabEventHandler::impl Functions ** +// ************************************************* class LLGroupMoneyTabEventHandler::impl { @@ -884,9 +884,9 @@ void LLGroupMoneyTabEventHandler::impl::updateButtons() } } -//******************************************* -//** LLGroupMoneyTabEventHandler Functions ** -//******************************************* +// ******************************************* +// ** LLGroupMoneyTabEventHandler Functions ** +// ******************************************* LLMap LLGroupMoneyTabEventHandler::sInstanceIDs; std::map LLGroupMoneyTabEventHandler::sTabsToHandlers; @@ -1004,9 +1004,9 @@ void LLGroupMoneyTabEventHandler::clickTabCallback(void* data, bool from_click) if ( selfp ) selfp->onClickTab(); } -//************************************************** -//** LLGroupMoneyDetailsTabEventHandler Functions ** -//************************************************** +// ************************************************** +// ** LLGroupMoneyDetailsTabEventHandler Functions ** +// ************************************************** LLGroupMoneyDetailsTabEventHandler::LLGroupMoneyDetailsTabEventHandler(LLButton* earlier_buttonp, LLButton* later_buttonp, @@ -1141,9 +1141,9 @@ void LLPanelGroupLandMoney::processGroupAccountDetailsReply(LLMessageSystem* msg selfp->processReply(msg, data); } -//************************************************ -//** LLGroupMoneySalesTabEventHandler Functions ** -//************************************************ +// ************************************************ +// ** LLGroupMoneySalesTabEventHandler Functions ** +// ************************************************ LLGroupMoneySalesTabEventHandler::LLGroupMoneySalesTabEventHandler(LLButton* earlier_buttonp, LLButton* later_buttonp, @@ -1317,9 +1317,9 @@ void LLPanelGroupLandMoney::processGroupAccountTransactionsReply(LLMessageSystem self->processReply(msg, data); } -//*************************************************** -//** LLGroupMoneyPlanningTabEventHandler Functions ** -//*************************************************** +// *************************************************** +// ** LLGroupMoneyPlanningTabEventHandler Functions ** +// *************************************************** LLGroupMoneyPlanningTabEventHandler::LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editorp, LLTabContainer* tab_containerp, diff --git a/indra/newview/llpanelgroupvoting.cpp b/indra/newview/llpanelgroupvoting.cpp index 5094d1c26..d3d24b7d0 100644 --- a/indra/newview/llpanelgroupvoting.cpp +++ b/indra/newview/llpanelgroupvoting.cpp @@ -762,7 +762,7 @@ void LLPanelGroupVoting::impl::sendStartGroupProposal() S32 quorum = llfloor(mQuorum->get()); - //*************************************Conversion to capability + // *************************************Conversion to capability LLSD body; std::string url = gAgent.getRegion()->getCapability("StartGroupProposal"); @@ -901,7 +901,7 @@ void LLPanelGroupVoting::impl::addPendingActiveScrollListItem(unsigned int curre EAddPosition pos) { std::stringstream pending; - //*TODO: translate + // *TODO: translate pending << "Retrieving active proposals (" << current << "\\" << expected << ")"; @@ -911,13 +911,13 @@ void LLPanelGroupVoting::impl::addPendingActiveScrollListItem(unsigned int curre void LLPanelGroupVoting::impl::addNoActiveScrollListItem(EAddPosition pos) { - //*TODO: translate + // *TODO: translate mProposals->addCommentText(std::string("There are currently no active proposals"), pos); } void LLPanelGroupVoting::impl::addNoHistoryScrollListItem(EAddPosition pos) { - //*TODO: translate + // *TODO: translate mVotesHistory->addCommentText(std::string("There are currently no archived proposals"), pos); } @@ -925,7 +925,7 @@ void LLPanelGroupVoting::impl::addPendingHistoryScrollListItem(unsigned int curr unsigned int expected, EAddPosition pos) { - //*TODO: translate + // *TODO: translate std::stringstream pending; pending << "Retrieving archived proposals (" << current @@ -1454,9 +1454,9 @@ void LLPanelGroupVoting::impl::onClickViewHistoryList(void *userdata) if ( self) self->setEnableHistoryList(); } -//********************************** -//** LLPanelGroupVoting Functions ** -//********************************** +// ********************************** +// ** LLPanelGroupVoting Functions ** +// ********************************** // static void* LLPanelGroupVoting::createTab(void* data) diff --git a/indra/newview/llpanelinventory.cpp b/indra/newview/llpanelinventory.cpp index 536322782..89eff24d2 100644 --- a/indra/newview/llpanelinventory.cpp +++ b/indra/newview/llpanelinventory.cpp @@ -30,12 +30,12 @@ * $/LicenseInfo$ */ -//***************************************************************************** +// ***************************************************************************** // // Implementation of the panel inventory - used to view and control a // task's inventory. // -//***************************************************************************** +// ***************************************************************************** #include "llviewerprecompiledheaders.h" diff --git a/indra/newview/llpanelinventory.h b/indra/newview/llpanelinventory.h index 287221e35..d06d716aa 100644 --- a/indra/newview/llpanelinventory.h +++ b/indra/newview/llpanelinventory.h @@ -30,12 +30,12 @@ * $/LicenseInfo$ */ -//***************************************************************************** +// ***************************************************************************** // // This class represents the panel used to view and control a // particular task's inventory. // -//***************************************************************************** +// ***************************************************************************** #ifndef LL_LLPANELINVENTORY_H #define LL_LLPANELINVENTORY_H diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 864c2d091..eec36f941 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -130,7 +130,7 @@ enum { MI_HOLE_COUNT }; -//*TODO:translate (depricated, so very low priority) +// *TODO:translate (deprecated, so very low priority) static const std::string LEGACY_FULLBRIGHT_DESC("Fullbright (Legacy)"); LLVector3 LLPanelObject::mClipboardPos; diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 3fd18cf7d..42820368a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3239,7 +3239,7 @@ void update_app(BOOL mandatory, const std::string& auth_msg) std::ostringstream message; - //*TODO:translate + // *TODO:translate std::string msg; if (!auth_msg.empty()) { diff --git a/indra/newview/lltoolbrush.cpp b/indra/newview/lltoolbrush.cpp index 06ed99a8b..41096c3d3 100644 --- a/indra/newview/lltoolbrush.cpp +++ b/indra/newview/lltoolbrush.cpp @@ -106,7 +106,7 @@ LLToolBrushLand::LLToolBrushLand() U8 LLToolBrushLand::getBrushIndex() { // find the best index for desired size - // (compatibility with old sims, brush_index is now depricated - DEV-8252) + // (compatibility with old sims, brush_index is now deprecated - DEV-8252) U8 index = 0; for (U8 i = 0; i < LAND_BRUSH_SIZE_COUNT; i++) { diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index fa096d5a5..b42ec4c17 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -780,7 +780,7 @@ BOOL LLToolDragAndDrop::handleToolTip(S32 x, S32 y, std::string& msg, LLRect *st if (!mToolTipMsg.empty()) { msg = mToolTipMsg; - //*sticky_rect_screen = gViewerWindow->getWindowRect(); + // *sticky_rect_screen = gViewerWindow->getWindowRect(); return TRUE; } return FALSE; diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp index 8382e0d72..7d176d755 100644 --- a/indra/newview/lltoolindividual.cpp +++ b/indra/newview/lltoolindividual.cpp @@ -30,13 +30,13 @@ * $/LicenseInfo$ */ -//***************************************************************************** +// ***************************************************************************** // // This is a tool for selecting individual object from the // toolbox. Handy for when you want to deal with child object // inventory... // -//***************************************************************************** +// ***************************************************************************** #include "llviewerprecompiledheaders.h" #include "lltoolindividual.h" diff --git a/indra/newview/lltoolview.cpp b/indra/newview/lltoolview.cpp index 9f6a77d24..0672f9ce8 100644 --- a/indra/newview/lltoolview.cpp +++ b/indra/newview/lltoolview.cpp @@ -77,7 +77,7 @@ LLToolView::~LLToolView() mContainList.clear(); } -//*TODO:translate? +// *TODO:translate? // void LLToolView::addTool(const std::string& icon_off, const std::string& icon_on, LLPanel* panel, LLTool* tool, LLView* hoverView, const char* label) // { // llassert(tool); diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index 622063aa9..c73c12da4 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -45,6 +45,7 @@ #include "lltoolfocus.h" #include "llviewerwindow.h" #include "llvoavatarself.h" +#include "lllslconstants.h" // // Constants @@ -60,12 +61,14 @@ const F32 YAW_NUDGE_RATE = 0.05f; // fraction of normal speed LLViewerKeyboard gViewerKeyboard; +bool isCrouch = 0; //Shouldn't start crouched. + void agent_jump( EKeystate s ) { if( KEYSTATE_UP == s ) return; F32 time = gKeyboard->getCurKeyElapsedTime(); S32 frame_count = llround(gKeyboard->getCurKeyElapsedFrameCount()); - + if(isCrouch) isCrouch=0; if( time < FLY_TIME || frame_count <= FLY_FRAMES || gAgent.upGrabbed() @@ -79,6 +82,24 @@ void agent_jump( EKeystate s ) gAgent.moveUp(1); } } +void agent_toggle_down( EKeystate s ) +{ + if(KEYSTATE_UP == s) return; + else if(KEYSTATE_DOWN == s && !(gAgent.getControlFlags() & AGENT_SITTING)) + if(isCrouch) isCrouch=0; + else if(!gAgent.getFlying()) + { + isCrouch=1; + gAgent.moveUp(-1); + } + else + gAgent.moveUp(-1); + else + { + gAgent.moveUp(-1); + if(isCrouch) isCrouch=0; + } +} void agent_push_down( EKeystate s ) { @@ -226,6 +247,7 @@ void agent_toggle_fly( EKeystate s ) if (KEYSTATE_DOWN == s ) { gAgent.toggleFlying(); + if(isCrouch) isCrouch=0; } } @@ -530,6 +552,7 @@ void bind_keyboard_functions() gViewerKeyboard.bindNamedFunction("push_backward", agent_push_backward); gViewerKeyboard.bindNamedFunction("look_up", agent_look_up); gViewerKeyboard.bindNamedFunction("look_down", agent_look_down); + gViewerKeyboard.bindNamedFunction("toggle_down", agent_toggle_down); gViewerKeyboard.bindNamedFunction("toggle_fly", agent_toggle_fly); gViewerKeyboard.bindNamedFunction("turn_left", agent_turn_left); gViewerKeyboard.bindNamedFunction("turn_right", agent_turn_right); diff --git a/indra/newview/llviewerkeyboard.h b/indra/newview/llviewerkeyboard.h index e5d834597..b52b738bd 100644 --- a/indra/newview/llviewerkeyboard.h +++ b/indra/newview/llviewerkeyboard.h @@ -93,5 +93,5 @@ protected: }; extern LLViewerKeyboard gViewerKeyboard; - +extern bool isCrouch; #endif // LL_LLVIEWERKEYBOARD_H diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index ffc19fda5..821a8477f 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7371,9 +7371,7 @@ class LLAvatarSendIM : public view_listener_t gIMMgr->setFloaterOpen(TRUE); //EInstantMessage type = have_agent_callingcard(gLastHitObjectID) // ? IM_SESSION_ADD : IM_SESSION_CARDLESS_START; - gIMMgr->addSession(name, - IM_NOTHING_SPECIAL, - avatar->getID()); + gIMMgr->addSession(LLCacheName::cleanFullName(name),IM_NOTHING_SPECIAL,avatar->getID()); } return true; } diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 21218e07a..9524ef1f6 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1656,7 +1656,7 @@ static std::string clean_name_from_im(const std::string& name, EInstantMessage t case IM_FRIENDSHIP_OFFERED: case IM_FRIENDSHIP_ACCEPTED: case IM_FRIENDSHIP_DECLINED_DEPRECATED: - //IM_TYPING_START + case IM_TYPING_START: //IM_TYPING_STOP return LLCacheName::cleanFullName(name); default: @@ -2170,7 +2170,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) case IM_MESSAGEBOX: { // This is a block, modeless dialog. - //*TODO:translate + // *TODO:translate args["MESSAGE"] = message; LLNotificationsUtil::add("SystemMessage", args); } @@ -3887,7 +3887,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) LL_DEBUGS("Messaging") << "process_agent_movement_complete()" << LL_ENDL; - // *TODO: check timestamp to make sure the movement compleation + // *TODO: check timestamp to make sure the movement completion // makes sense. LLVector3 agent_pos; msg->getVector3Fast(_PREHASH_Data, _PREHASH_Position, agent_pos); diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 6174e70eb..2faefc19b 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -1266,7 +1266,7 @@ void LLViewerFetchedTexture::init(bool firstinit) LLViewerFetchedTexture::~LLViewerFetchedTexture() { - //*NOTE getTextureFetch can return NULL when Viewer is shutting down. + // *NOTE getTextureFetch can return NULL when Viewer is shutting down. // This is due to LLWearableList is singleton and is destroyed after // LLAppViewer::cleanup() was called. (see ticket EXT-177) if (mHasFetcher && LLAppViewer::getTextureFetch()) diff --git a/indra/newview/llvoclouds.cpp b/indra/newview/llvoclouds.cpp index 615e77fcb..9bfe6f8e9 100644 --- a/indra/newview/llvoclouds.cpp +++ b/indra/newview/llvoclouds.cpp @@ -249,10 +249,10 @@ void LLVOClouds::getGeometry(S32 idx, verticesp->setAdd(ppamu, right); (*verticesp++).getF32ptr()[3] = 0.f; - //*verticesp++ = puff_pos_agent - right + up; - //*verticesp++ = puff_pos_agent - right - up; - //*verticesp++ = puff_pos_agent + right + up; - //*verticesp++ = puff_pos_agent + right - up; + // *verticesp++ = puff_pos_agent - right + up; + // *verticesp++ = puff_pos_agent - right - up; + // *verticesp++ = puff_pos_agent + right + up; + // *verticesp++ = puff_pos_agent + right - up; *colorsp++ = color; *colorsp++ = color; diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp index 0db46ddee..8eb22554c 100644 --- a/indra/newview/llvopartgroup.cpp +++ b/indra/newview/llvopartgroup.cpp @@ -360,10 +360,10 @@ void LLVOPartGroup::getGeometry(S32 idx, verticesp->setAdd(ppamu, right); (*verticesp++).getF32ptr()[3] = 0.f; - //*verticesp++ = part_pos_agent + up - right; - //*verticesp++ = part_pos_agent - up - right; - //*verticesp++ = part_pos_agent + up + right; - //*verticesp++ = part_pos_agent - up + right; + // *verticesp++ = part_pos_agent + up - right; + // *verticesp++ = part_pos_agent - up - right; + // *verticesp++ = part_pos_agent + up + right; + // *verticesp++ = part_pos_agent - up + right; *colorsp++ = part.mColor; *colorsp++ = part.mColor; diff --git a/indra/newview/llwindebug.cpp b/indra/newview/llwindebug.cpp index 4d175a071..5c7ee642d 100644 --- a/indra/newview/llwindebug.cpp +++ b/indra/newview/llwindebug.cpp @@ -238,9 +238,9 @@ BOOL GetThreadCallStack(DWORD thread_id, LLSD& info) //Windows Call Stack Construction idea from //http://www.codeproject.com/tools/minidump.asp -//**************************************************************************************** +// **************************************************************************************** BOOL WINAPI Get_Module_By_Ret_Addr(PBYTE Ret_Addr, LPWSTR Module_Name, PBYTE & Module_Addr) -//**************************************************************************************** +// **************************************************************************************** // Find module by Ret_Addr (address in the module). // Return Module_Name (full path) and Module_Addr (start address). // Return TRUE if found. @@ -371,11 +371,11 @@ bool shouldUseStackWalker(PSTACK Ebp, int max_depth) return false; } -//****************************************************************** +// ****************************************************************** void WINAPI Get_Call_Stack(const EXCEPTION_RECORD* exception_record, const CONTEXT* context_record, LLSD& info) -//****************************************************************** +// ****************************************************************** // Fill Str with call stack info. // pException can be either GetExceptionInformation() or NULL. // If pException = NULL - get current call stack. @@ -503,9 +503,9 @@ void WINAPI Get_Call_Stack(const EXCEPTION_RECORD* exception_record, } //Get_Call_Stack -//*********************************** +// *********************************** void WINAPI Get_Version_Str(LLSD& info) -//*********************************** +// *********************************** // Fill Str with Windows version. { OSVERSIONINFOEX V = {sizeof(OSVERSIONINFOEX)}; //EX for NT 5.0 and later @@ -524,9 +524,9 @@ void WINAPI Get_Version_Str(LLSD& info) V.dwMajorVersion, V.dwMinorVersion, V.dwBuildNumber, V.wServicePackMajor, V.wServicePackMinor, V.wProductType); } //Get_Version_Str -//************************************************************* +// ************************************************************* LLSD WINAPI Get_Exception_Info(PEXCEPTION_POINTERS pException) -//************************************************************* +// ************************************************************* // Allocate Str[DUMP_SIZE_MAX] and return Str with dump, if !pException - just return call stack in Str. { LLSD info; diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp index 4bab56090..8568e1c59 100755 --- a/indra/plugins/webkit/media_plugin_webkit.cpp +++ b/indra/plugins/webkit/media_plugin_webkit.cpp @@ -230,7 +230,7 @@ private: #endif #if LL_WINDOWS - //*NOTE:Mani - On windows, at least, the component path is the + // *NOTE:Mani - On windows, at least, the component path is the // location of this dll's image file. std::string component_dir; char dll_path[_MAX_PATH]; diff --git a/indra/test/lldatapacker_tut.cpp b/indra/test/lldatapacker_tut.cpp index 6c0fa56d5..620d7f1ea 100644 --- a/indra/test/lldatapacker_tut.cpp +++ b/indra/test/lldatapacker_tut.cpp @@ -53,7 +53,7 @@ namespace tut typedef datapacker_test_t::object datapacker_test_object_t; tut::datapacker_test_t tut_datapacker_test("datapacker_test"); - //*********LLDataPackerBinaryBuffer + // *********LLDataPackerBinaryBuffer template<> template<> void datapacker_test_object_t::test<1>() { @@ -219,7 +219,7 @@ namespace tut ensure_equals("2.LLDataPackerBinaryBuffer::operator= failed", str,unpkbuf); } - //*********LLDataPackerAsciiBuffer + // *********LLDataPackerAsciiBuffer template<> template<> void datapacker_test_object_t::test<7>() @@ -345,7 +345,7 @@ namespace tut ensure("LLDataPackerAsciiBuffer::assignBuffer failed" , ((lldp.getBufferSize() == size) && (1 == lldp.getCurrentSize()))) ; } - //*********LLDataPackerAsciiFile + // *********LLDataPackerAsciiFile template<> template<> void datapacker_test_object_t::test<11>() diff --git a/indra/test/lljoint_tut.cpp b/indra/test/lljoint_tut.cpp index a84d2b6ac..72071ebbf 100644 --- a/indra/test/lljoint_tut.cpp +++ b/indra/test/lljoint_tut.cpp @@ -228,7 +228,7 @@ namespace tut } - //* + // * Test cases for the following not added. They perform operations on underlying LLXformMatrix and LLVector3 elements which have been unit tested separately. @@ -243,6 +243,6 @@ namespace tut 6) void setConstraintSilhouette(LLDynamicArray& silhouette); 7) void clampRotation(LLQuaternion old_rot, LLQuaternion new_rot); - //* + // * } #endif // THIS_DOESNT_LINK diff --git a/indra/test/llpartdata_tut.cpp b/indra/test/llpartdata_tut.cpp index cb31b81c0..bec25a028 100644 --- a/indra/test/llpartdata_tut.cpp +++ b/indra/test/llpartdata_tut.cpp @@ -152,7 +152,7 @@ namespace tut } -//*********llpartsysdata*********** +// *********llpartsysdata*********** template<> template<> void partdata_test_object_t::test<3>()