Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A bunch of minor formatting tweaks not worth a separate commit for.

Browse Source 
Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-24 20:24:05 -04:00
parent 4bf3859c09
commit a101b166ac
8 changed files with 17 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/character/avatar_lad.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="US-ASCII" standalone="yes"?> <?xml version="1.0" encoding="us-ascii" standalone="yes"?>
<linden_avatar <linden_avatar
version="1.0" version="1.0"
wearable_definition_version="22"> wearable_definition_version="22">
@@ -6609,7 +6609,7 @@
<layer <layer
name="head_tattoo"> name="head_tattoo">
<texture <texture
local_texture="head_tattoo" /> local_texture="head_tattoo" />
<param id="1062" group="1" edit_group="colorpicker_driven" wearable="tattoo" <param id="1062" group="1" edit_group="colorpicker_driven" wearable="tattoo"
name="tattoo_head_red" value_min="0" value_max="1" value_default="1"> name="tattoo_head_red" value_min="0" value_max="1" value_default="1">
<param_color> <param_color>
@@ -6634,7 +6634,7 @@
</param_color> </param_color>
</param> </param>
</layer> </layer>
</layer_set> </layer_set>
<!-- =========================================================== --> <!-- =========================================================== -->
<layer_set <layer_set

3
indra/newview/llfloatercustomize.cpp
View File

@@ -455,8 +455,7 @@ BOOL LLPanelEditWearable::postBuild()
"inv_item_skin.tga" );*/ "inv_item_skin.tga" );*/
std::string icon_name = get_item_icon_name(asset_type,LLInventoryType::IT_WEARABLE,mType,FALSE); std::string icon_name = get_item_icon_name(asset_type,LLInventoryType::IT_WEARABLE,mType,FALSE);
childSetValue("icon", icon_name); childSetValue("icon", icon_name);
childSetValue("icon", icon_name);
childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this ); childSetAction("Create New", LLPanelEditWearable::onBtnCreateNew, this );

4
indra/newview/llfloatervfs.cpp
View File

@@ -303,10 +303,10 @@ void LLFloaterVFS::onClickAdd(void* user_data)
file.mType = asset_type; file.mType = asset_type;
file.mName = gDirUtilp->getBaseFileName(file_name, true); file.mName = gDirUtilp->getBaseFileName(file_name, true);
floaterp->add(file); floaterp->add(file);
if(floaterp->getChild<LLCheckBoxCtrl>("create_pretend_item")->get()) /*if(floaterp->getChild<LLCheckBoxCtrl>("create_pretend_item")->get())
{ {
LLLocalInventory::addItem(file.mName, (int)file.mType, file.mID, true); LLLocalInventory::addItem(file.mName, (int)file.mType, file.mID, true);
} }*/
} }
} }
// static // static

35
indra/newview/llinventorybridge.h
View File

@@ -129,41 +129,6 @@ public:
} }
}; };
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLInventoryPanelObserver // Class LLInventoryPanelObserver
// //

1
indra/newview/llpreviewgesture.h
View File

@@ -168,7 +168,6 @@ protected:
LLCheckBoxCtrl* mActiveCheck; LLCheckBoxCtrl* mActiveCheck;
LLButton* mSaveBtn; LLButton* mSaveBtn;
LLButton* mPreviewBtn; LLButton* mPreviewBtn;
LLMultiGesture* mPreviewGesture; LLMultiGesture* mPreviewGesture;

2
indra/newview/lltexturectrl.cpp
View File

@@ -1480,7 +1480,7 @@ BOOL LLTextureCtrl::allowDrop(LLInventoryItem* item)
return TRUE; return TRUE;
} }
} }
else
{ {
return FALSE; return FALSE;
} }

8
indra/newview/lltoolpie.cpp
View File

@@ -329,15 +329,16 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
gMenuHolder->setParcelSelection(selection); gMenuHolder->setParcelSelection(selection);
gPieLand->show(x, y, mPieMouseButtonDown); gPieLand->show(x, y, mPieMouseButtonDown);
// <edit>
if(!gSavedSettings.getBOOL("DisablePointAtAndBeam")) if(!gSavedSettings.getBOOL("DisablePointAtAndBeam"))
{ {
// </edit> // </edit>
// VEFFECT: ShowPie // VEFFECT: ShowPie
LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE); LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_SPHERE, TRUE);
effectp->setPositionGlobal(mPick.mPosGlobal); effectp->setPositionGlobal(mPick.mPosGlobal);
effectp->setColor(LLColor4U(gAgent.getEffectColor())); effectp->setColor(LLColor4U(gAgent.getEffectColor()));
effectp->setDuration(0.25f); effectp->setDuration(0.25f);
// <edit> // <edit>
} }
// </edit> // </edit>
} }
@@ -407,6 +408,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
gPieObject->show(x, y, mPieMouseButtonDown); gPieObject->show(x, y, mPieMouseButtonDown);
// <edit>
if(!gSavedSettings.getBOOL("DisablePointAtAndBeam")) if(!gSavedSettings.getBOOL("DisablePointAtAndBeam"))
{ {
// </edit> // </edit>

7
indra/newview/llvoavatar.cpp
View File

@@ -9156,7 +9156,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
if( !param ) if( !param )
{ {
llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl; llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Too few)." << llendl;
return; return;
} }
@@ -9206,7 +9206,10 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
} }
if( param ) if( param )
{ {
llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file." << llendl; if (param->getName() == "tattoo_red")
llinfos << "No tattoo tinting for " << getFullname() << "." << llendl;
else
llwarns << "Number of params in AvatarAppearance msg does not match number of params in avatar xml file for " << getFullname() << " (Prematurely reached end of list at " << param->getName() << ")." << llendl;
return; return;
} }