Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
This commit is contained in:
@@ -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)))
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
//*******************************************************************************************************************************
|
||||
// *******************************************************************************************************************************
|
||||
//
|
||||
|
||||
@@ -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);
|
||||
//*******************************************************************************************************************************
|
||||
// *******************************************************************************************************************************
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -347,7 +347,7 @@ bool LLCrashLogger::sendCrashLogs()
|
||||
|
||||
bool sent = false;
|
||||
|
||||
//*TODO: Translate
|
||||
// *TODO: Translate
|
||||
if(mCrashHost != "")
|
||||
{
|
||||
sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), 3, 5);
|
||||
|
||||
@@ -2182,7 +2182,7 @@ BOOL LLVolume::generate()
|
||||
mLODScaleBias.setVec(0.6f, 0.6f, 0.6f);
|
||||
}
|
||||
|
||||
//********************************************************************
|
||||
// ********************************************************************
|
||||
//debug info, to be removed
|
||||
if((U32)(mPathp->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);
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -65,9 +65,9 @@ LLImageGL* LLImageGL::sDefaultGLTexture = NULL ;
|
||||
|
||||
std::set<LLImageGL*> LLImageGL::sImageList;
|
||||
|
||||
//****************************************************************************************************
|
||||
// ****************************************************************************************************
|
||||
//The below for texture auditing use only
|
||||
//****************************************************************************************************
|
||||
// ****************************************************************************************************
|
||||
//-----------------------
|
||||
//debug use
|
||||
BOOL gAuditTexture = FALSE ;
|
||||
@@ -84,11 +84,11 @@ std::vector<S32> LLImageGL::sTextureMemByCategory;
|
||||
std::vector<S32> LLImageGL::sTextureMemByCategoryBound ;
|
||||
std::vector<S32> 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()
|
||||
|
||||
@@ -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<S32> sTextureMemByCategoryBound ;
|
||||
static std::vector<S32> sTextureCurMemByCategoryBound ;
|
||||
//----------------------------------------
|
||||
//****************************************************************************************************
|
||||
// ****************************************************************************************************
|
||||
//End of definitions for texture auditing use only
|
||||
//****************************************************************************************************
|
||||
// ****************************************************************************************************
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ LLPostProcess::LLPostProcess(void) :
|
||||
}
|
||||
|
||||
setSelectedEffect("default");
|
||||
//*/
|
||||
// */
|
||||
}
|
||||
|
||||
LLPostProcess::~LLPostProcess(void)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1648,7 +1648,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))
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -2658,9 +2658,9 @@ U32 LLXMLNode::getChildCount() const
|
||||
return 0;
|
||||
}
|
||||
|
||||
//***************************************************
|
||||
// ***************************************************
|
||||
// UNIT TESTING
|
||||
//***************************************************
|
||||
// ***************************************************
|
||||
|
||||
U32 get_rand(U32 max_value)
|
||||
{
|
||||
|
||||
@@ -1215,7 +1215,7 @@ void LLAgent::setAFK()
|
||||
gAwayTimer.start();
|
||||
if (gAFKMenu)
|
||||
{
|
||||
//*TODO:Translate
|
||||
// *TODO:Translate
|
||||
gAFKMenu->setLabel(std::string("Set Not Away"));
|
||||
}
|
||||
}
|
||||
@@ -1241,7 +1241,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 +1264,7 @@ void LLAgent::setBusy()
|
||||
mIsBusy = TRUE;
|
||||
if (gBusyMenu)
|
||||
{
|
||||
//*TODO:Translate
|
||||
// *TODO:Translate
|
||||
gBusyMenu->setLabel(std::string("Set Not Busy"));
|
||||
}
|
||||
LLFloaterMute::getInstance()->updateButtons();
|
||||
@@ -1279,7 +1279,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();
|
||||
|
||||
@@ -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;
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
|
||||
@@ -2000,7 +2000,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
|
||||
@@ -2401,7 +2401,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.
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 |_______________________________________________________
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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<LLUUID, LLGroupMoneyTabEventHandler*> LLGroupMoneyTabEventHandler::sInstanceIDs;
|
||||
std::map<LLPanel*, LLGroupMoneyTabEventHandler*> 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,
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -30,12 +30,12 @@
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
//*****************************************************************************
|
||||
// *****************************************************************************
|
||||
//
|
||||
// Implementation of the panel inventory - used to view and control a
|
||||
// task's inventory.
|
||||
//
|
||||
//*****************************************************************************
|
||||
// *****************************************************************************
|
||||
|
||||
#include "llviewerprecompiledheaders.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
|
||||
|
||||
@@ -3232,7 +3232,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())
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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];
|
||||
|
||||
@@ -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>()
|
||||
|
||||
@@ -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<LLVector3>& silhouette);
|
||||
7) void clampRotation(LLQuaternion old_rot, LLQuaternion new_rot);
|
||||
|
||||
//*
|
||||
// *
|
||||
}
|
||||
#endif // THIS_DOESNT_LINK
|
||||
|
||||
@@ -152,7 +152,7 @@ namespace tut
|
||||
}
|
||||
|
||||
|
||||
//*********llpartsysdata***********
|
||||
// *********llpartsysdata***********
|
||||
|
||||
template<> template<>
|
||||
void partdata_test_object_t::test<3>()
|
||||
|
||||
Reference in New Issue
Block a user