livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

meow-7.2.2
prep 2012-02-16 10:49:07 -05:00
parent 40f928fc6a f43939f6bc
commit 70f8225a30
9 changed files with 298 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
indra/newview/llfloaterpathfindingbasic.cpp
View File

@ -30,6 +30,9 @@
#include "llsd.h"
#include "llagent.h"
#include "lltextbase.h"
#include "llbutton.h"
#include "llviewerregion.h"
//---------------------------------------------------------------------------
// LLFloaterPathfindingBasic
@ -37,15 +40,40 @@
BOOL LLFloaterPathfindingBasic::postBuild()
{
childSetAction("enter_unfrozen_mode", boost::bind(&LLFloaterPathfindingBasic::onUnfreezeClicked, this));
childSetAction("enter_frozen_mode", boost::bind(&LLFloaterPathfindingBasic::onFreezeClicked, this));
mRegionNotEnabledText = findChild<LLTextBase>("disabled_warning_label");
llassert(mRegionNotEnabledText != NULL);
mUnfreezeLabel = findChild<LLTextBase>("unfreeze_label");
llassert(mUnfreezeLabel != NULL);
mUnfreezeButton = findChild<LLButton>("enter_unfrozen_mode");
llassert(mUnfreezeButton != NULL);
mUnfreezeButton->setCommitCallback(boost::bind(&LLFloaterPathfindingBasic::onUnfreezeClicked, this));
mFreezeLabel = findChild<LLTextBase>("freeze_label");
llassert(mFreezeLabel != NULL);
mFreezeButton = findChild<LLButton>("enter_frozen_mode");
llassert(mFreezeButton != NULL);
mFreezeButton->setCommitCallback(boost::bind(&LLFloaterPathfindingBasic::onFreezeClicked, this));
updateOnFrozenState();
return LLFloater::postBuild();
}
void LLFloaterPathfindingBasic::onOpen(const LLSD& key)
{
}
LLFloaterPathfindingBasic::LLFloaterPathfindingBasic(const LLSD& pSeed)
: LLFloater(pSeed)
: LLFloater(pSeed),
mRegionNotEnabledText(NULL),
mUnfreezeLabel(NULL),
mUnfreezeButton(NULL),
mFreezeLabel(NULL),
mFreezeButton(NULL),
mIsRegionFrozenXXX(true)
{
}
@ -53,12 +81,61 @@ LLFloaterPathfindingBasic::~LLFloaterPathfindingBasic()
{
}
std::string LLFloaterPathfindingBasic::getCapabilityURL() const
{
std::string capURL("");
LLViewerRegion *region = gAgent.getRegion();
if (region != NULL)
{
capURL = region->getCapability("RetrieveNavMeshSrc");
}
return capURL;
}
void LLFloaterPathfindingBasic::updateOnFrozenState()
{
std::string capURL = getCapabilityURL();
if (capURL.empty())
{
mRegionNotEnabledText->setVisible(TRUE);
mUnfreezeLabel->setEnabled(FALSE);
mUnfreezeButton->setEnabled(FALSE);
mFreezeLabel->setEnabled(FALSE);
mFreezeButton->setEnabled(FALSE);
}
else
{
mRegionNotEnabledText->setVisible(FALSE);
if (mIsRegionFrozenXXX)
{
mUnfreezeLabel->setEnabled(TRUE);
mUnfreezeButton->setEnabled(TRUE);
mFreezeLabel->setEnabled(FALSE);
mFreezeButton->setEnabled(FALSE);
}
else
{
mUnfreezeLabel->setEnabled(FALSE);
mUnfreezeButton->setEnabled(FALSE);
mFreezeLabel->setEnabled(TRUE);
mFreezeButton->setEnabled(TRUE);
}
}
}
void LLFloaterPathfindingBasic::onUnfreezeClicked()
{
mIsRegionFrozenXXX = false;
updateOnFrozenState();
llwarns << "functionality has not yet been implemented to set unfrozen state" << llendl;
}
void LLFloaterPathfindingBasic::onFreezeClicked()
{
mIsRegionFrozenXXX = true;
updateOnFrozenState();
llwarns << "functionality has not yet been implemented to set frozen state" << llendl;
}

15
indra/newview/llfloaterpathfindingbasic.h
View File

@ -32,6 +32,8 @@
#include "llhandle.h"
class LLSD;
class LLTextBase;
class LLButton;
class LLFloaterPathfindingBasic
: public LLFloater
@ -39,8 +41,8 @@ class LLFloaterPathfindingBasic
friend class LLFloaterReg;
public:
virtual BOOL postBuild();
virtual void onOpen(const LLSD& key);
protected:
@ -52,6 +54,17 @@ private:
void onUnfreezeClicked();
void onFreezeClicked();
std::string getCapabilityURL() const;
void updateOnFrozenState();
LLTextBase *mRegionNotEnabledText;
LLTextBase *mUnfreezeLabel;
LLButton *mUnfreezeButton;
LLTextBase *mFreezeLabel;
LLButton *mFreezeButton;
bool mIsRegionFrozenXXX; // XXX stinson : Feb 15, 2012 : I think this will be unneeded with the service
};
#endif // LL_LLFLOATERPATHFINDINGBASIC_H

155
indra/newview/llfloaterpathfindingconsole.cpp
View File

@ -70,10 +70,6 @@ LLHandle<LLFloaterPathfindingConsole> LLFloaterPathfindingConsole::sInstanceHand
BOOL LLFloaterPathfindingConsole::postBuild()
{
childSetAction("view_characters_floater", boost::bind(&LLFloaterPathfindingConsole::onViewCharactersClicked, this));
childSetAction("view_and_edit_linksets", boost::bind(&LLFloaterPathfindingConsole::onViewEditLinksetClicked, this));
childSetAction("clear_path", boost::bind(&LLFloaterPathfindingConsole::onClearPathClicked, this));
mShowNavMeshCheckBox = findChild<LLCheckBoxCtrl>("show_navmesh");
llassert(mShowNavMeshCheckBox != NULL);
@ -97,12 +93,37 @@ BOOL LLFloaterPathfindingConsole::postBuild()
llassert(mShowWorldCheckBox != NULL);
mShowWorldCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onShowWorldToggle, this));
mPathfindingStatus = findChild<LLTextBase>("pathfinding_status");
llassert(mPathfindingStatus != NULL);
mViewCharactersButton = findChild<LLButton>("view_characters_floater");
llassert(mViewCharactersButton != NULL);
mViewCharactersButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onViewCharactersClicked, this));
mEditTestTabContainer = findChild<LLTabContainer>("edit_test_tab_container");
llassert(mEditTestTabContainer != NULL);
mUnfreezeLabel = findChild<LLTextBase>("unfreeze_label");
llassert(mUnfreezeLabel != NULL);
mUnfreezeButton = findChild<LLButton>("enter_unfrozen_mode");
llassert(mUnfreezeButton != NULL);
mUnfreezeButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onUnfreezeClicked, this));
mLinksetsLabel = findChild<LLTextBase>("edit_linksets_label");
llassert(mLinksetsLabel != NULL);
mLinksetsButton = findChild<LLButton>("view_and_edit_linksets");
llassert(mLinksetsButton != NULL);
mLinksetsButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onViewEditLinksetClicked, this));
mFreezeLabel = findChild<LLTextBase>("freeze_label");
llassert(mFreezeLabel != NULL);
mFreezeButton = findChild<LLButton>("enter_frozen_mode");
llassert(mFreezeButton != NULL);
mFreezeButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onFreezeClicked, this));
mPathfindingStatus = findChild<LLTextBase>("pathfinding_status");
llassert(mPathfindingStatus != NULL);
mCharacterWidthSlider = findChild<LLSliderCtrl>("character_width");
llassert(mCharacterWidthSlider != NULL);
mCharacterWidthSlider->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onCharacterWidthSet, this));
@ -113,6 +134,12 @@ BOOL LLFloaterPathfindingConsole::postBuild()
mPathTestingStatus = findChild<LLTextBase>("path_test_status");
llassert(mPathTestingStatus != NULL);
mClearPathButton = findChild<LLButton>("clear_path");
llassert(mClearPathButton != NULL);
mClearPathButton->setCommitCallback(boost::bind(&LLFloaterPathfindingConsole::onClearPathClicked, this));
updateOnPathfindingServerStatus();
updatePathTestStatus();
return LLFloater::postBuild();
@ -237,8 +264,8 @@ void LLFloaterPathfindingConsole::setRenderWorld(BOOL pIsRenderWorld)
mShowWorldCheckBox->set(pIsRenderWorld);
}
LLFloaterPathfindingConsole::ERenderHeatmapType LLFloaterPathfindingConsole::getRenderHeatmapType() const
{
LLFloaterPathfindingConsole::ERenderHeatmapType LLFloaterPathfindingConsole::getRenderHeatmapType() const
{
ERenderHeatmapType renderHeatmapType;
switch (mShowNavMeshWalkabilityComboBox->getValue().asInteger())
@ -265,10 +292,10 @@ LLFloaterPathfindingConsole::ERenderHeatmapType LLFloaterPathfindingConsole::get
}
return renderHeatmapType;
}
void LLFloaterPathfindingConsole::setRenderHeatmapType(ERenderHeatmapType pRenderHeatmapType)
{
}
void LLFloaterPathfindingConsole::setRenderHeatmapType(ERenderHeatmapType pRenderHeatmapType)
{
LLSD comboBoxValue;
switch (pRenderHeatmapType)
@ -295,7 +322,7 @@ void LLFloaterPathfindingConsole::setRenderHeatmapType(ERenderHeatmapType pRende
}
return mShowNavMeshWalkabilityComboBox->setValue(comboBoxValue);
}
}
F32 LLFloaterPathfindingConsole::getCharacterWidth() const
{
@ -390,13 +417,22 @@ LLFloaterPathfindingConsole::LLFloaterPathfindingConsole(const LLSD& pSeed)
mShowExclusionVolumesCheckBox(NULL),
mShowWorldCheckBox(NULL),
mPathfindingStatus(NULL),
mViewCharactersButton(NULL),
mEditTestTabContainer(NULL),
mUnfreezeLabel(NULL),
mUnfreezeButton(NULL),
mLinksetsLabel(NULL),
mLinksetsButton(NULL),
mFreezeLabel(NULL),
mFreezeButton(NULL),
mCharacterWidthSlider(NULL),
mCharacterTypeRadioGroup(NULL),
mPathTestingStatus(NULL),
mClearPathButton(NULL),
mNavMeshCnt(0),
mHasStartPoint(false),
mHasEndPoint(false)
mHasEndPoint(false),
mIsRegionFrozen(false)
{
mSelfHandle.bind(this);
@ -478,6 +514,21 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey)
}
}
}
updateOnPathfindingServerStatus();
}
std::string LLFloaterPathfindingConsole::getCurrentRegionCapabilityURL() const
{
std::string capURL("");
LLViewerRegion *region = gAgent.getRegion();
if (region != NULL)
{
capURL = region->getCapability("RetrieveNavMeshSrc");
}
return capURL;
}
void LLFloaterPathfindingConsole::onShowWalkabilitySet()
@ -573,6 +624,20 @@ void LLFloaterPathfindingConsole::onViewCharactersClicked()
LLFloaterPathfindingCharacters::openCharactersViewer();
}
void LLFloaterPathfindingConsole::onUnfreezeClicked()
{
mIsRegionFrozen = false;
updateOnPathfindingServerStatus();
llwarns << "functionality has not yet been implemented to set unfrozen state" << llendl;
}
void LLFloaterPathfindingConsole::onFreezeClicked()
{
mIsRegionFrozen = true;
updateOnPathfindingServerStatus();
llwarns << "functionality has not yet been implemented to set frozen state" << llendl;
}
void LLFloaterPathfindingConsole::onViewEditLinksetClicked()
{
LLFloaterPathfindingLinksets::openLinksetsEditor();
@ -585,6 +650,68 @@ void LLFloaterPathfindingConsole::onClearPathClicked()
updatePathTestStatus();
}
void LLFloaterPathfindingConsole::updateOnPathfindingServerStatus()
{
std::string capURL = getCurrentRegionCapabilityURL();
if (capURL.empty())
{
mShowNavMeshCheckBox->setEnabled(FALSE);
mShowNavMeshWalkabilityComboBox->setEnabled(FALSE);
mShowWalkablesCheckBox->setEnabled(FALSE);
mShowStaticObstaclesCheckBox->setEnabled(FALSE);
mShowMaterialVolumesCheckBox->setEnabled(FALSE);
mShowExclusionVolumesCheckBox->setEnabled(FALSE);
mShowWorldCheckBox->setEnabled(FALSE);
mViewCharactersButton->setEnabled(FALSE);
mEditTestTabContainer->setEnabled(FALSE);
mUnfreezeLabel->setEnabled(FALSE);
mUnfreezeButton->setEnabled(FALSE);
mLinksetsLabel->setEnabled(FALSE);
mLinksetsButton->setEnabled(FALSE);
mFreezeLabel->setEnabled(FALSE);
mFreezeButton->setEnabled(FALSE);
mCharacterWidthSlider->setEnabled(FALSE);
mCharacterTypeRadioGroup->setEnabled(FALSE);
mClearPathButton->setEnabled(FALSE);
mEditTestTabContainer->selectTab(0);
}
else
{
mShowNavMeshCheckBox->setEnabled(TRUE);
mShowNavMeshWalkabilityComboBox->setEnabled(TRUE);
mShowWalkablesCheckBox->setEnabled(TRUE);
mShowStaticObstaclesCheckBox->setEnabled(TRUE);
mShowMaterialVolumesCheckBox->setEnabled(TRUE);
mShowExclusionVolumesCheckBox->setEnabled(TRUE);
mShowWorldCheckBox->setEnabled(TRUE);
mViewCharactersButton->setEnabled(TRUE);
mEditTestTabContainer->setEnabled(TRUE);
mCharacterWidthSlider->setEnabled(TRUE);
mCharacterTypeRadioGroup->setEnabled(TRUE);
mClearPathButton->setEnabled(TRUE);
if (mIsRegionFrozen)
{
mUnfreezeLabel->setEnabled(TRUE);
mUnfreezeButton->setEnabled(TRUE);
mLinksetsLabel->setEnabled(FALSE);
mLinksetsButton->setEnabled(FALSE);
mFreezeLabel->setEnabled(FALSE);
mFreezeButton->setEnabled(FALSE);
}
else
{
mUnfreezeLabel->setEnabled(FALSE);
mUnfreezeButton->setEnabled(FALSE);
mLinksetsLabel->setEnabled(TRUE);
mLinksetsButton->setEnabled(TRUE);
mFreezeLabel->setEnabled(TRUE);
mFreezeButton->setEnabled(TRUE);
}
}
}
void LLFloaterPathfindingConsole::generatePath()
{
if (mHasStartPoint && mHasEndPoint)

15
indra/newview/llfloaterpathfindingconsole.h
View File

@ -41,6 +41,7 @@ class LLTextBase;
class LLCheckBoxCtrl;
class LLTabContainer;
class LLComboBox;
class LLButton;
class LLFloaterPathfindingConsole
: public LLFloater
@ -113,15 +114,20 @@ private:
virtual ~LLFloaterPathfindingConsole();
virtual void onOpen(const LLSD& pKey);
std::string getCurrentRegionCapabilityURL() const;
void onShowWalkabilitySet();
void onShowWorldToggle();
void onCharacterWidthSet();
void onCharacterTypeSwitch();
void onViewCharactersClicked();
void onUnfreezeClicked();
void onFreezeClicked();
void onViewEditLinksetClicked();
void onClearPathClicked();
void updateOnPathfindingServerStatus();
void generatePath();
void updatePathTestStatus();
@ -134,10 +140,19 @@ private:
LLCheckBoxCtrl *mShowExclusionVolumesCheckBox;
LLCheckBoxCtrl *mShowWorldCheckBox;
LLTextBase *mPathfindingStatus;
LLButton *mViewCharactersButton;
LLTabContainer *mEditTestTabContainer;
LLTextBase *mUnfreezeLabel;
LLButton *mUnfreezeButton;
LLTextBase *mLinksetsLabel;
LLButton *mLinksetsButton;
LLTextBase *mFreezeLabel;
LLButton *mFreezeButton;
LLSliderCtrl *mCharacterWidthSlider;
LLRadioGroup *mCharacterTypeRadioGroup;
LLTextBase *mPathTestingStatus;
LLButton *mClearPathButton;
bool mIsRegionFrozen;
LLNavMeshDownloadObserver mNavMeshDownloadObserver[10];
int mCurrentMDO;

24
indra/newview/llpanelvolume.cpp
View File

@ -68,7 +68,6 @@
#include "llworld.h"
#include "pipeline.h"
#include "llviewershadermgr.h"
#include "llradiogroup.h"
#include "lldrawpool.h"
#include "lluictrlfactory.h"
@ -159,14 +158,6 @@ BOOL LLPanelVolume::postBuild()
mSpinPhysicsRestitution->setCommitCallback(boost::bind(&LLPanelVolume::sendPhysicsRestitution, this, _1, mSpinPhysicsRestitution));
}
// Pathfinding Parameters
{
// Pathfinding state
mPathfindingType = findChild<LLRadioGroup>("edit_pathfinding_state");
llassert(mPathfindingType != NULL);
mPathfindingType->setCommitCallback(boost::bind(&LLPanelVolume::sendPathfindingType, this));
}
std::map<std::string, std::string> material_name_map;
material_name_map["Stone"]= LLTrans::getString("Stone");
material_name_map["Metal"]= LLTrans::getString("Metal");
@ -203,8 +194,7 @@ BOOL LLPanelVolume::postBuild()
LLPanelVolume::LLPanelVolume()
: LLPanel(),
mComboMaterialItemCount(0),
mPathfindingType(NULL)
mComboMaterialItemCount(0)
{
setMouseOpaque(FALSE);
@ -473,8 +463,6 @@ void LLPanelVolume::getState( )
mSpinPhysicsRestitution->set(objectp->getPhysicsRestitution());
mSpinPhysicsRestitution->setEnabled(editable);
mPathfindingType->setEnabled(editable);
// update the physics shape combo to include allowed physics shapes
mComboPhysicsShapeType->removeall();
mComboPhysicsShapeType->add(getString("None"), LLSD(1));
@ -558,8 +546,6 @@ void LLPanelVolume::refresh()
getChildView("Physics Friction")->setVisible(enable_mesh);
getChildView("Physics Density")->setVisible(enable_mesh);
getChildView("Physics Restitution")->setVisible(enable_mesh);
mPathfindingType->setVisible(enable_mesh);
/* TODO: add/remove individual physics shape types as per the PhysicsShapeTypes simulator features */
}
@ -614,8 +600,6 @@ void LLPanelVolume::clearCtrls()
mSpinPhysicsDensity->setEnabled(FALSE);
mSpinPhysicsRestitution->setEnabled(FALSE);
mPathfindingType->setEnabled(FALSE);
mComboMaterial->setEnabled( FALSE );
}
@ -701,12 +685,6 @@ void LLPanelVolume::sendPhysicsDensity(LLUICtrl* ctrl, void* userdata)
LLSelectMgr::getInstance()->selectionSetDensity(val);
}
void LLPanelVolume::sendPathfindingType()
{
S32 val = mPathfindingType->getValue().asInteger();
llwarns << "functionality to set '" << mPathfindingType->getName() << "' to value " << val << " has not been implemented." << llendl;
}
void LLPanelVolume::refreshCost()
{
LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstObject();

5
indra/newview/llpanelvolume.h
View File

@ -40,7 +40,6 @@ class LLButton;
class LLViewerObject;
class LLComboBox;
class LLColorSwatchCtrl;
class LLRadioGroup;
class LLPanelVolume : public LLPanel
{
@ -85,8 +84,6 @@ protected:
void sendPhysicsRestitution(LLUICtrl* ctrl, void* userdata);
void sendPhysicsDensity(LLUICtrl* ctrl, void* userdata);
void sendPathfindingType();
/*
LLTextBox* mLabelSelectSingleMessage;
// Light
@ -121,8 +118,6 @@ protected:
LLSpinCtrl* mSpinPhysicsFriction;
LLSpinCtrl* mSpinPhysicsDensity;
LLSpinCtrl* mSpinPhysicsRestitution;
LLRadioGroup* mPathfindingType;
};
#endif

29
indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
View File

@ -2,7 +2,7 @@
<floater
open_positioning="cascading"
can_tear_off="false"
height="204"
height="213"
layout="topleft"
name="floater_pathfinding_basic"
help_topic="floater_pathfinding_basic"
@ -13,17 +13,34 @@
width="312">
<text
height="13"
word_wrap="true"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
text_color="DrYellow"
length="1"
follows="left|top"
layout="topleft"
left="15"
top="15"
name="disabled_warning_label"
top="8"
width="289">
Permit object / terrain changes:
This region is not enabled for pathfinding.
</text>
<text
height="13"
word_wrap="true"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
text_readonly_color="LabelDisabledColor"
length="1"
follows="left|top"
layout="topleft"
left="15"
name="unfreeze_label"
top_pad="4"
width="289">
Allow object / terrain changes:
</text>
<button
follows="left|top"
@ -38,11 +55,13 @@
use_ellipses="false"
type="string"
text_color="LabelTextColor"
text_readonly_color="LabelDisabledColor"
length="1"
follows="left|top"
layout="topleft"
line_spacing.multiple="1.5"
left="15"
name="freeze_label"
top_pad="23"
width="289">
In unfrozen mode, you can move and make changes to objects and terrain. When you are finished, click the Freeze button. It may require a few minutes to process your changes.

39
indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
View File

@ -2,7 +2,7 @@
<floater
open_positioning="cascading"
can_tear_off="false"
height="330"
height="352"
layout="topleft"
name="floater_pathfinding_console"
help_topic="floater_pathfinding_console"
@ -10,12 +10,12 @@
save_rect="true"
single_instance="true"
title="Pathfinding edit / test"
width="455">
width="456">
<floater.string name="navmesh_fetch_initial"></floater.string>
<floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
<floater.string name="navmesh_fetch_complete_available">Navmesh received.</floater.string>
<floater.string name="navmesh_fetch_complete_none">No navmesh for region.</floater.string>
<floater.string name="navmesh_region_not_enabled">Pathfinding is not enabled for this region.</floater.string>
<floater.string name="navmesh_region_not_enabled">This region is not enabled for pathfinding.</floater.string>
<floater.string name="navmesh_library_not_implemented">Cannot find pathing library implementation.</floater.string>
<floater.string name="pathing_choose_start_and_end_points">Please choose start and end points.</floater.string>
<floater.string name="pathing_choose_start_point">Please choose start point.</floater.string>
@ -31,7 +31,7 @@
follows="left|top"
layout="topleft"
left="15"
top="8"
top="9"
width="208">
Show:
</text>
@ -41,7 +41,7 @@
layout="topleft"
left="14"
name="show_navmesh"
top_pad="8"
top_pad="7"
width="90" />
<text
height="13"
@ -54,14 +54,15 @@
layout="topleft"
left="35"
width="208">
Show walkability heatmap:
Show walkability map:
</text>
<combo_box
height="18"
height="19"
layout="topleft"
left="34"
name="show_heatmap_mode"
width="125">
top_pad="8"
width="156">
<combo_box.item
label="None"
name="show_heatmap_mode_none"
@ -133,7 +134,7 @@
left="14"
height="0"
width="200"
top_pad="7"
top_pad="12"
visible="true" />
<panel
border="false"
@ -206,18 +207,18 @@
layout="topleft"
left="230"
top="35"
height="276"
width="215"
height="305"
width="214"
visible="true" />
<tab_container
follows="left|top"
layout="topleft"
tab_position="top"
name="edit_test_tab_container"
left="226"
left="227"
top="14"
height="298"
width="220">
height="327"
width="218">
<panel
border="false"
bevel_style="none"
@ -231,14 +232,16 @@
use_ellipses="false"
type="string"
text_color="LabelTextColor"
text_readonly_color="LabelDisabledColor"
length="1"
follows="left|top"
layout="topleft"
name="unfreeze_label"
left="16"
top_pad="17"
top_pad="16"
height="13"
width="190">
Permit object / terrain changes:
Allow object / terrain changes:
</text>
<button
follows="left|top"
@ -255,10 +258,12 @@
use_ellipses="false"
type="string"
text_color="LabelTextColor"
text_readonly_color="LabelDisabledColor"
length="1"
follows="left|top"
layout="topleft"
left="16"
name="edit_linksets_label"
top_pad="23"
height="13"
width="190">
@ -278,11 +283,13 @@
use_ellipses="false"
type="string"
text_color="LabelTextColor"
text_readonly_color="LabelDisabledColor"
length="1"
follows="left|top"
layout="topleft"
left="16"
line_spacing.multiple="1.5"
name="freeze_label"
top_pad="23"
height="26"
width="190">

40
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -2401,46 +2401,6 @@ even though the user gets a free copy.
name="Physics Restitution"
top_pad="8"
width="132" />
<text
type="string"
length="1"
follows="left|top"
height="10"
layout="topleft"
left_delta="0"
top_delta="45"
name="pathfinding_type_label"
width="121">
Pathfinding Type:
</text>
<radio_group
follows="top|left"
height="55"
layout="topleft"
name="edit_pathfinding_state"
left_delta="0"
top_delta="15"
value="1"
width="75">
<radio_item
label="Walkable"
layout="topleft"
height="13"
name="edit_pathfinding_state_walkable"
value="1"/>
<radio_item
label="Obstacle"
layout="topleft"
height="13"
name="edit_pathfinding_state_obstacle"
value="2"/>
<radio_item
label="Ignored"
layout="topleft"
height="13"
name="edit_pathfinding_state_ignored"
value="3"/>
</radio_group>
</panel>
<panel
border="false"