diff options
| author | prep <none@none> | 2012-03-01 17:34:23 -0500 |
|---|---|---|
| committer | prep <none@none> | 2012-03-01 17:34:23 -0500 |
| commit | 91028d2b3ba7c7bc2f32457f13f7deec06f4586e (patch) | |
| tree | b491c59aa3ea46d75f4ed874a56935f754f789e2 /indra/newview | |
| parent | c4ddaf67cb31517c3d5e379d0237a21d1d7b2c9d (diff) | |
| parent | 9c4cc94174330affbcae8526bee34d6eb1dce0e4 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerobject.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index b6e3f0442e..63215942ac 100644 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -477,6 +477,8 @@ public: inline BOOL flagObjectCopy() const { return ((mFlags & FLAGS_OBJECT_COPY) != 0); } inline BOOL flagObjectMove() const { return ((mFlags & FLAGS_OBJECT_MOVE) != 0); } inline BOOL flagObjectTransfer() const { return ((mFlags & FLAGS_OBJECT_TRANSFER) != 0); } + inline BOOL flagObjectPermanent() const { return ((mFlags & FLAGS_OBJECT_PERMANENT) != 0); } + inline BOOL flagCharacter() const { return ((mFlags & FLAGS_CHARACTER) != 0); } inline BOOL flagIncludeInSearch() const { return ((mFlags & FLAGS_INCLUDE_IN_SEARCH) != 0); } inline BOOL flagScripted() const { return ((mFlags & FLAGS_SCRIPTED) != 0); } inline BOOL flagHandleTouch() const { return ((mFlags & FLAGS_HANDLE_TOUCH) != 0); } diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml index 38adda6655..d00b85f5d7 100644 --- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml +++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml @@ -28,10 +28,10 @@ <floater.string name="linkset_terrain_dist_from_you">--</floater.string> <floater.string name="linkset_use_walkable">Walkable</floater.string> <floater.string name="linkset_use_static_obstacle">Static obstacle</floater.string> - <floater.string name="linkset_use_dynamic_obstacle">Dynamic obstacle</floater.string> + <floater.string name="linkset_use_dynamic_obstacle">Movable obstacle</floater.string> <floater.string name="linkset_use_material_volume">Material volume</floater.string> <floater.string name="linkset_use_exclusion_volume">Exclusion volume</floater.string> - <floater.string name="linkset_use_dynamic_phantom">Dynamic phantom</floater.string> + <floater.string name="linkset_use_dynamic_phantom">Movable phantom</floater.string> <floater.string name="linkset_is_terrain">[unmodifiable]</floater.string> <floater.string name="linkset_is_restricted_state">[restricted]</floater.string> <floater.string name="linkset_choose_use">Choose linkset use...</floater.string> @@ -126,7 +126,7 @@ name="filter_by_linkset_use_static_obstacle" value="2" /> <combo_box.item - label="Dynamic obstacle" + label="Movable obstacle" name="filter_by_linkset_use_dynamic_obstacle" value="3" /> <combo_box.item @@ -138,7 +138,7 @@ name="filter_by_linkset_use_exclusion_volume" value="5" /> <combo_box.item - label="Dynamic phantom" + label="Movable phantom" name="filter_by_linkset_use_dynamic_phantom" value="6" /> </combo_box> |