Skip to content

Commit 1f1e5e3

Browse files
marchcatmarchcat
committed
#1156 Remove Linden Trees and Grass from Build floater
1 parent 06d9ff1 commit 1f1e5e3

20 files changed

+4
-76
lines changed

‎indra/newview/llfloatertools.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,7 @@ static const std::string toolNames[]={
197197
"ToolHemiSphere",
198198
"ToolTorus",
199199
"ToolTube",
200-
"ToolRing",
201-
"ToolTree",
202-
"ToolGrass"};
200+
"ToolRing"};
203201
LLPCode toolData[]={
204202
LL_PCODE_CUBE,
205203
LL_PCODE_PRISM,
@@ -213,9 +211,7 @@ LLPCode toolData[]={
213211
LL_PCODE_SPHERE_HEMI,
214212
LL_PCODE_TORUS,
215213
LLViewerObject::LL_VO_SQUARE_TORUS,
216-
LLViewerObject::LL_VO_TRIANGLE_TORUS,
217-
LL_PCODE_LEGACY_TREE,
218-
LL_PCODE_LEGACY_GRASS};
214+
LLViewerObject::LL_VO_TRIANGLE_TORUS};
219215

220216
bool LLFloaterTools::postBuild()
221217
{

‎indra/newview/llfloatertools.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class LLFloaterTools
169169

170170
LLButton *mBtnApplyToSelection;
171171

172-
std::vector<LLButton*> mButtons;//[ 15 ];
172+
std::vector<LLButton*> mButtons;//[ 13 ];
173173

174174
LLTabContainer *mTab;
175175
LLPanelPermissions *mPanelPermissions;

‎indra/newview/lltoolplacer.cpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -199,22 +199,8 @@ bool LLToolPlacer::rezNewObject(LLPCode pcode, LLViewerObject * hit_obj, S32 hit
199199
bool create_selected = false;
200200
LLVolumeParams volume_params;
201201

202-
U8 state = 0;
203-
204202
switch (pcode)
205203
{
206-
case LL_PCODE_LEGACY_GRASS:
207-
// Randomize size of grass patch
208-
scale.setVec(10.f + ll_frand(20.f), 10.f + ll_frand(20.f), 1.f + ll_frand(2.f));
209-
state = rand() % LLVOGrass::sMaxGrassSpecies;
210-
break;
211-
212-
213-
case LL_PCODE_LEGACY_TREE:
214-
case LL_PCODE_TREE_NEW:
215-
state = rand() % LLVOTree::sMaxTreeSpecies;
216-
break;
217-
218204
case LL_PCODE_SPHERE:
219205
case LL_PCODE_CONE:
220206
case LL_PCODE_CUBE:
@@ -408,7 +394,7 @@ bool LLToolPlacer::rezNewObject(LLPCode pcode, LLViewerObject * hit_obj, S32 hit
408394
gMessageSystem->addVector3Fast(_PREHASH_RayEnd, ray_end_region );
409395
gMessageSystem->addU8Fast(_PREHASH_BypassRaycast, (U8)b_hit_land );
410396
gMessageSystem->addU8Fast(_PREHASH_RayEndIsIntersection, (U8)false );
411-
gMessageSystem->addU8Fast(_PREHASH_State, state);
397+
gMessageSystem->addU8Fast(_PREHASH_State, (U8)0 );
412398

413399
// Limit raycast to a single object.
414400
// Speeds up server raycast + avoid problems with server ray hitting objects

‎indra/newview/skins/default/textures/build/Object_Grass.png

-456 Bytes
Binary file not shown.

‎indra/newview/skins/default/textures/build/Object_Grass_Selected.png

-757 Bytes
Binary file not shown.

‎indra/newview/skins/default/textures/build/Object_Tree.png

-737 Bytes
Binary file not shown.

‎indra/newview/skins/default/textures/build/Object_Tree_Selected.png

-839 Bytes
Binary file not shown.

‎indra/newview/skins/default/textures/textures.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,6 @@ with the same filename but different name
432432
<texture name="Object_Cube_Selected" file_name="build/Object_Cube_Selected.png" preload="false" />
433433
<texture name="Object_Cylinder" file_name="build/Object_Cylinder.png" preload="false" />
434434
<texture name="Object_Cylinder_Selected" file_name="build/Object_Cylinder_Selected.png" preload="false" />
435-
<texture name="Object_Grass" file_name="build/Object_Grass.png" preload="false" />
436-
<texture name="Object_Grass_Selected" file_name="build/Object_Grass_Selected.png" preload="false" />
437435
<texture name="Object_Hemi_Cone" file_name="build/Object_Hemi_Cone.png" preload="false" />
438436
<texture name="Object_Hemi_Cone_Selected" file_name="build/Object_Hemi_Cone_Selected.png" preload="false" />
439437
<texture name="Object_Hemi_Cylinder" file_name="build/Object_Hemi_Cylinder.png" preload="false" />
@@ -452,8 +450,6 @@ with the same filename but different name
452450
<texture name="Object_Tetrahedron_Selected" file_name="build/Object_Tetrahedron_Selected.png" preload="false" />
453451
<texture name="Object_Torus" file_name="build/Object_Torus.png" preload="false" />
454452
<texture name="Object_Torus_Selected" file_name="build/Object_Torus_Selected.png" preload="false" />
455-
<texture name="Object_Tree" file_name="build/Object_Tree.png" preload="false" />
456-
<texture name="Object_Tree_Selected" file_name="build/Object_Tree_Selected.png" preload="false" />
457453
<texture name="Object_Tube" file_name="build/Object_Tube.png" preload="false" />
458454
<texture name="Object_Tube_Selected" file_name="build/Object_Tube_Selected.png" preload="false" />
459455

‎indra/newview/skins/default/xui/da/floater_tools.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@
9494
<button label="" label_selected="" name="ToolTorus" tool_tip="Kuglering"/>
9595
<button label="" label_selected="" name="ToolTube" tool_tip="Rør"/>
9696
<button label="" label_selected="" name="ToolRing" tool_tip="Ring"/>
97-
<button label="" label_selected="" name="ToolTree" tool_tip="Træ"/>
98-
<button label="" label_selected="" name="ToolGrass" tool_tip="Græs"/>
9997
<check_box label="Hold værktøjet valgt" name="checkbox sticky"/>
10098
<check_box label="Kopier valgte" name="checkbox copy selection"/>
10199
<check_box initial_value="true" label="Centreret kopi" name="checkbox copy centers"/>

‎indra/newview/skins/default/xui/de/floater_tools.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@
9494
<button label="" label_selected="" name="ToolTorus" tool_tip="Torus"/>
9595
<button label="" label_selected="" name="ToolTube" tool_tip="Rohr"/>
9696
<button label="" label_selected="" name="ToolRing" tool_tip="Ring"/>
97-
<button label="" label_selected="" name="ToolTree" tool_tip="Baum"/>
98-
<button label="" label_selected="" name="ToolGrass" tool_tip="Gras"/>
9997
<check_box label="Ausgewähltes Werkzeug beibehalten" name="checkbox sticky"/>
10098
<check_box label="Auswahl kopieren" name="checkbox copy selection"/>
10199
<check_box initial_value="true" label="Kopie zentrieren" name="checkbox copy centers"/>

0 commit comments

Comments
 (0)