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

remove prototype access code used for server testing

meow-7.2.2
Oz Linden 2013-01-16 17:28:30 -05:00
parent b3e10f0f49
commit 8a576ea16f
6 changed files with 1 additions and 2440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@ -194,7 +194,6 @@ set(viewer_SOURCE_FILES
llfloaterbuyland.cpp
llfloatercamera.cpp
llfloatercolorpicker.cpp
llfloaterdebugmaterials.cpp
llfloaterdeleteenvpreset.cpp
llfloaterdestinations.cpp
llfloaterdisplayname.cpp
@ -773,7 +772,6 @@ set(viewer_HEADER_FILES
llfloaterbuyland.h
llfloatercamera.h
llfloatercolorpicker.h
llfloaterdebugmaterials.h
llfloaterdeleteenvpreset.h
llfloaterdestinations.h
llfloaterdisplayname.h

1245
indra/newview/llfloaterdebugmaterials.cpp
View File

File diff suppressed because it is too large Load Diff

186
indra/newview/llfloaterdebugmaterials.h
View File

@ -1,186 +0,0 @@
/**
* @file llfloaterdebugmaterials.h
* @brief Header file for llfloaterdebugmaterials
* @author Stinson@lindenlab.com
*
* $LicenseInfo:firstyear=2012&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2012, Linden Research, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
#ifndef LL_LLFLOATERDEBUGMATERIALS_H
#define LL_LLFLOATERDEBUGMATERIALS_H
#include <string>
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include "llfloater.h"
#include "llmaterial.h"
#include "llmaterialmgr.h"
#include "lluuid.h"
#include "v4color.h"
class LLButton;
class LLColorSwatchCtrl;
class LLColor4U;
class LLLineEditor;
class LLMaterialID;
class LLScrollListCtrl;
class LLSD;
class LLSpinCtrl;
class LLTextBase;
class LLTextureCtrl;
class LLUICtrl;
class MultiMaterialsResponder;
typedef boost::shared_ptr<MultiMaterialsResponder> MultiMaterialsResponderPtr;
class LLFloaterDebugMaterials : public LLFloater
{
public:
virtual BOOL postBuild();
virtual void onOpen(const LLSD& pKey);
virtual void onClose(bool pIsAppQuitting);
virtual void draw();
protected:
private:
friend class LLFloaterReg;
typedef enum {
kNoRegion,
kCapabilitiesLoading,
kReady,
kRequestStarted,
kRequestCompleted,
kNotEnabled,
kError
} EState;
LLFloaterDebugMaterials(const LLSD& pParams);
virtual ~LLFloaterDebugMaterials();
void onGetClicked();
void onValueEntered(LLUICtrl* pUICtrl);
void onPutSetClicked();
void onPutClearClicked();
void onResetPutValuesClicked();
void onQueryVisibleObjectsClicked();
void onPostClicked();
void onRegionCross();
void onInWorldSelectionChange();
void onGetScrollListSelectionChange(LLUICtrl* pUICtrl);
void onPostScrollListSelectionChange(LLUICtrl* pUICtrl);
void onViewableObjectsScrollListSelectionChange();
void onDeferredCheckRegionMaterialStatus(LLUUID regionId);
void onDeferredRequestGetMaterials(LLUUID regionId);
void onDeferredRequestPutMaterials(LLUUID regionId, bool pIsDoSet);
void checkRegionMaterialStatus();
void checkRegionMaterialStatus(const LLUUID& regionId);
void requestGetMaterials();
void requestGetMaterials(const LLUUID& regionId);
void requestPutMaterials(bool pIsDoSet);
void requestPutMaterials(const LLUUID& regionId, bool pIsDoSet);
static void onGetMaterials(const LLUUID& region_id, const LLMaterialMgr::material_map_t& materials);
static void onPostMaterial(const LLMaterialID& material_id, const LLMaterialPtr materialp);
void parseQueryViewableObjects();
void setState(EState pState);
inline EState getState() const;
void refreshObjectEdit();
void resetObjectEditInputs();
void clearGetResults();
void clearPostResults();
void clearViewableObjectsResults();
void setUnparsedQueryData();
void clearUnparsedQueryData();
void updateQueryParsingStatus();
void updateStatusMessage();
void updateControls();
LLMaterial getMaterial() const;
LLTextBase* mStatusText;
LLButton* mGetButton;
LLTextBase* mParsingStatusText;
LLScrollListCtrl* mGetNormalMapScrollList;
LLScrollListCtrl* mGetSpecularMapScrollList;
LLScrollListCtrl* mGetOtherDataScrollList;
LLTextureCtrl* mNormalMap;
LLSpinCtrl* mNormalMapOffsetX;
LLSpinCtrl* mNormalMapOffsetY;
LLSpinCtrl* mNormalMapRepeatX;
LLSpinCtrl* mNormalMapRepeatY;
LLSpinCtrl* mNormalMapRotation;
LLTextureCtrl* mSpecularMap;
LLSpinCtrl* mSpecularMapOffsetX;
LLSpinCtrl* mSpecularMapOffsetY;
LLSpinCtrl* mSpecularMapRepeatX;
LLSpinCtrl* mSpecularMapRepeatY;
LLSpinCtrl* mSpecularMapRotation;
LLColorSwatchCtrl* mSpecularColor;
LLSpinCtrl* mSpecularColorAlpha;
LLLineEditor* mSpecularExponent;
LLLineEditor* mEnvironmentExponent;
LLLineEditor* mAlphaMaskCutoff;
LLLineEditor* mDiffuseAlphaMode;
LLButton* mPutSetButton;
LLButton* mPutClearButton;
LLScrollListCtrl* mPutScrollList;
LLButton* mQueryViewableObjectsButton;
LLTextBase* mQueryStatusText;
LLScrollListCtrl* mViewableObjectsScrollList;
LLButton* mPostButton;
LLScrollListCtrl* mPostNormalMapScrollList;
LLScrollListCtrl* mPostSpecularMapScrollList;
LLScrollListCtrl* mPostOtherDataScrollList;
LLColor4 mDefaultSpecularColor;
EState mState;
LLColor4 mWarningColor;
LLColor4 mErrorColor;
boost::signals2::connection mRegionCrossConnection;
boost::signals2::connection mTeleportFailedConnection;
boost::signals2::connection mSelectionUpdateConnection;
S32 mNextUnparsedQueryDataIndex;
};
LLFloaterDebugMaterials::EState LLFloaterDebugMaterials::getState() const
{
return mState;
}
#endif // LL_LLFLOATERDEBUGMATERIALS_H

3
indra/newview/llviewerfloaterreg.cpp
View File

@ -50,7 +50,6 @@
#include "llfloaterbump.h"
#include "llfloaterbvhpreview.h"
#include "llfloatercamera.h"
#include "llfloaterdebugmaterials.h"
#include "llfloaterdeleteenvpreset.h"
#include "llfloaterdisplayname.h"
#include "llfloatereditdaycycle.h"
@ -256,7 +255,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("pathfinding_characters", "floater_pathfinding_characters.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingCharacters>);
LLFloaterReg::add("pathfinding_linksets", "floater_pathfinding_linksets.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingLinksets>);
LLFloaterReg::add("pathfinding_console", "floater_pathfinding_console.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPathfindingConsole>);
LLFloaterReg::add("floater_debug_materials", "floater_debug_materials.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDebugMaterials>);
LLFloaterReg::add("people", "floater_people.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("places", "floater_places.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("preferences", "floater_preferences.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPreference>);

995
indra/newview/skins/default/xui/en/floater_debug_materials.xml
View File

@ -1,995 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
positioning="cascading"
can_tear_off="false"
can_resize="true"
height="770"
width="1040"
min_height="795"
min_width="1040"
layout="topleft"
name="floater_debug_materials"
reuse_instance="true"
save_rect="false"
single_instance="true"
title="Debug materials">
<floater.string name="status_no_region">No current region available.</floater.string>
<floater.string name="status_capabilities_loading">Region capabilities are loading.</floater.string>
<floater.string name="status_ready">Materials are enabled for this region.</floater.string>
<floater.string name="status_request_started">Request sent.</floater.string>
<floater.string name="status_request_completed">Request received.</floater.string>
<floater.string name="status_not_enabled">Materials are not enabled for this region.</floater.string>
<floater.string name="status_error">An error occurred during the request.</floater.string>
<floater.string name="loading_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string>
<floater.string name="loading_status_done">Complete</floater.string>
<floater.string name="querying_status_in_progress">Processing [NUM_PROCESSED] out of [NUM_TOTAL]</floater.string>
<floater.string name="querying_status_done">Complete</floater.string>
<panel
border="false"
bevel_style="none"
follows="left|top"
layout="topleft"
left="12"
top_pad="10"
height="61"
width="214">
<text
height="13"
word_wrap="true"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
layout="topleft"
left="0"
top_pad="0"
width="214">
Status
</text>
<text
height="40"
word_wrap="true"
use_ellipses="false"
type="string"
text_color="MaterialGoodColor"
length="1"
follows="left|top"
layout="topleft"
left="0"
name="material_status"
top_pad="8"
width="214">
</text>
</panel>
<tab_container
follows="left|top|right"
layout="topleft"
tab_position="top"
left="10"
top_pad="10"
height="670"
width="1020">
<panel
border="true"
bevel_style="none"
follows="left|top|right"
layout="topleft"
label="Current region"
height="641"
top_pad="10"
width="1020">
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="479"
top_pad="10"
width="1020">
<button
follows="left|top"
height="22"
label="Get"
layout="topleft"
name="get_button"
top_pad="0"
width="214"/>
<text
height="13"
word_wrap="true"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left="2"
top_pad="8"
width="150">
Loading Status
</text>
<text
height="13"
word_wrap="true"
use_ellipses="false"
type="string"
text_color="MaterialGoodColor"
length="1"
follows="left|top"
layout="topleft"
left_pad="0"
name="loading_status"
top_pad="-13"
width="400">
</text>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
height="135"
layout="topleft"
left="0"
top_pad="10"
tab_stop="false"
multi_select="false"
name="get_other_data_scroll_list"
width="775">
<scroll_list.columns
label="Material ID"
name="id"
dynamic_width="true" />
<scroll_list.columns
label="Specular Color"
name="specular_color"
width="120" />
<scroll_list.columns
label="Specular Exponent"
name="specular_exponent"
width="112" />
<scroll_list.columns
label="Env Intensity"
name="env_intensity"
width="80" />
<scroll_list.columns
label="Alpha Mask Cutoff"
name="alpha_mask_cutoff"
width="110" />
<scroll_list.columns
label="Diffuse Alpha Mode"
name="diffuse_alpha_mode"
width="118" />
</scroll_list>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
height="135"
layout="topleft"
top_pad="10"
tab_stop="false"
multi_select="false"
name="get_specular_map_scroll_list"
width="1020">
<scroll_list.columns
label="Material ID"
name="id"
dynamic_width="true" />
<scroll_list.columns
label="Specular Map"
name="specular_map_list_map"
width="225" />
<scroll_list.columns
label="Offset X"
name="specular_map_list_offset_x"
width="112" />
<scroll_list.columns
label="Offset Y"
name="specular_map_list_offset_y"
width="112" />
<scroll_list.columns
label="Repeat X"
name="specular_map_list_repeat_x"
width="112" />
<scroll_list.columns
label="Repeat Y"
name="specular_map_list_repeat_y"
width="112" />
<scroll_list.columns
label="Rotation"
name="specular_map_list_rotation"
width="112" />
</scroll_list>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
height="135"
layout="topleft"
top_pad="10"
tab_stop="false"
multi_select="false"
name="get_normal_map_scroll_list"
width="1020">
<scroll_list.columns
label="Material ID"
name="id"
dynamic_width="true" />
<scroll_list.columns
label="Normal Map"
name="normal_map_list_map"
width="225" />
<scroll_list.columns
label="Offset X"
name="normal_map_list_offset_x"
width="112" />
<scroll_list.columns
label="Offset Y"
name="normal_map_list_offset_y"
width="112" />
<scroll_list.columns
label="Repeat X"
name="normal_map_list_repeat_x"
width="112" />
<scroll_list.columns
label="Repeat Y"
name="normal_map_list_repeat_y"
width="112" />
<scroll_list.columns
label="Rotation"
name="normal_map_list_rotation"
width="112" />
</scroll_list>
</panel>
</panel>
<panel
border="true"
bevel_style="none"
follows="left|top|right"
layout="topleft"
label="Object editing"
height="641"
top_pad="10"
width="1010">
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
left="2"
top_pad="10"
height="420"
width="810">
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="265"
top_pad="0"
width="810">
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="226"
top_pad="0"
width="263">
<text
height="13"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left="0"
top_pad="38"
width="160">
Normal Map
</text>
<texture_picker
allow_no_texture="true"
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
left_pad="0"
top_pad="-50"
label_width="0"
height="100"
width="100"
mouse_opaque="true"
name="normal_map"
tool_tip="Click to open texture picker" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="0.1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-260"
label="Normal Map Offset X"
max_val="1.0"
min_val="-1.0"
name="normal_map_offset_x"
width="240" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="0.1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-240"
label="Normal Map Offset Y"
max_val="1.0"
min_val="-1.0"
name="normal_map_offset_y"
top_pad="10"
width="240" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="0.1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-240"
label="Normal Map Repeat X"
max_val="64"
min_val="0.0"
name="normal_map_repeat_x"
top_pad="10"
width="240" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="0.1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-240"
max_val="64"
min_val="0.0"
label="Normal Map Repeat Y"
name="normal_map_repeat_y"
top_pad="10"
width="240" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-240"
label="Normal Map Rotation"
max_val="9999"
min_val="-9999"
name="normal_map_rotation"
top_pad="10"
width="240" />
</panel>
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="226"
top_pad="-226"
left_pad="20"
width="263">
<text
height="13"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left="0"
top_pad="38"
width="160">
Specular Map
</text>
<texture_picker
allow_no_texture="true"
can_apply_immediately="true"
default_image_name="Default"
follows="left|top"
left_pad="0"
top_pad="-50"
label_width="0"
height="100"
width="100"
mouse_opaque="true"
name="specular_map"
tool_tip="Click to open texture picker" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="0.1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-260"
label="Specular Map Offset X"
max_val="1.0"
min_val="-1.0"
name="specular_map_offset_x"
width="240" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="0.1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-240"
label="Specular Map Offset Y"
max_val="1.0"
min_val="-1.0"
name="specular_map_offset_y"
top_pad="10"
width="240" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="0.1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-240"
label="Specular Map Repeat X"
max_val="64"
min_val="0.0"
name="specular_map_repeat_x"
top_pad="10"
width="240" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="0.1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-240"
label="Specular Map Repeat Y"
max_val="64"
min_val="0.0"
name="specular_map_repeat_y"
top_pad="10"
width="240" />
<spinner
allow_text_entry="true"
follows="left|top"
height="20"
initial_value="0"
increment="1"
decimal_digits="4"
label_width="160"
layout="topleft"
left_pad="-240"
label="Specular Map Rotation"
max_val="9999"
min_val="-9999"
name="specular_map_rotation"
top_pad="10"
width="240" />
</panel>
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="162"
top_pad="-226"
left_pad="20"
width="243">
<text
height="13"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left="0"
top_pad="10"
width="160">
Specular Color
</text>
<color_swatch
can_apply_immediately="true"
color="1 1 1 1"
follows="left|top"
height="30"
layout="topleft"
label_height="0"
label_width="0"
left_pad="0"
top_pad="-22"
name="specular_color"
tool_tip="Click to open color picker"
width="40" />
<spinner
follows="left|top"
height="20"
initial_value="255"
max_val="255"
min_val="0"
increment="1"
decimal_digits="0"
allow_text_entry="true"
layout="topleft"
label_width="160"
left="0"
top_pad="10"
label="Specular Color Alpha"
name="specular_color_alpha"
width="240" />
<text
height="13"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left_pad="-240"
top_pad="13"
width="160">
Specular Exponent
</text>
<line_editor
border_style="line"
border_thickness="1"
default_text="0"
follows="left|top"
height="20"
layout="topleft"
left_pad="0"
top_pad="-18"
max_length_chars="255"
name="specular_exponent"
width="80" />
<text
height="13"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left_pad="-240"
top_pad="10"
width="160">
Environment Exponent
</text>
<line_editor
border_style="line"
border_thickness="1"
default_text="0"
follows="left|top"
height="20"
layout="topleft"
left_pad="0"
top_pad="-18"
max_length_chars="255"
name="environment_exponent"
width="80" />
<text
height="13"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left_pad="-240"
top_pad="10"
width="160">
Alpha Mask Cuttoff
</text>
<line_editor
border_style="line"
border_thickness="1"
default_text="0"
follows="left|top"
height="20"
layout="topleft"
left_pad="0"
top_pad="-18"
max_length_chars="255"
name="alpha_mask_cutoff"
width="80" />
<text
height="13"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left_pad="-240"
top_pad="10"
width="160">
Diffuse Alpha Mode
</text>
<line_editor
border_style="line"
border_thickness="1"
default_text="0"
follows="left|top"
height="20"
layout="topleft"
left_pad="0"
top_pad="-18"
max_length_chars="255"
name="diffuse_alpha_mode"
width="80" />
</panel>
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="22"
left="0"
top_pad="80"
width="810">
<button
follows="left|top"
height="22"
label="Set Face Data"
layout="topleft"
name="put_set_button"
left="0"
top="0"
width="214"/>
<button
follows="left|top"
height="22"
label="Clear Face Data"
layout="topleft"
name="put_clear_button"
left_pad="20"
width="214"/>
<button
follows="left|top"
height="22"
label="Reset Input Values"
layout="topleft"
name="reset_put_values_button"
left_pad="146"
width="214"/>
</panel>
</panel>
<view_border
bevel_style="none"
follows="left|top"
height="0"
layout="topleft"
name="horiz_separator"
top_pad="10"
left="0"
width="810"/>
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="125"
top_pad="20"
width="400">
<text
height="13"
word_wrap="false"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left="0"
top_pad="0"
width="160">
Active selection
</text>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
height="300"
layout="topleft"
left="0"
top_pad="10"
tab_stop="false"
multi_select="true"
name="put_scroll_list"
width="600">
<scroll_list.columns
label="Object ID"
name="object_id"
width="225" />
<scroll_list.columns
label="Face Index"
name="face_index"
width="70" />
<scroll_list.columns
label="MaterialID"
name="material_id"
dynamic_width="true" />
</scroll_list>
</panel>
</panel>
</panel>
<panel
border="true"
bevel_style="none"
follows="left|top|right"
layout="topleft"
label="Viewable objects"
height="641"
top_pad="10"
width="1020">
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="641"
top_pad="0"
width="1020">
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
left="0"
top_pad="10"
height="153"
width="835">
<button
follows="left|top"
height="22"
label="Query Viewable Objects"
layout="topleft"
name="query_viewable_objects_button"
top_pad="0"
width="214"/>
<text
height="13"
word_wrap="true"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
length="1"
follows="left|top"
layout="topleft"
left="2"
top_pad="8"
width="150">
Loading Status
</text>
<text
height="13"
word_wrap="true"
use_ellipses="false"
type="string"
text_color="MaterialGoodColor"
length="1"
follows="left|top"
layout="topleft"
left_pad="0"
name="query_status"
top_pad="-13"
width="400">
</text>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
height="100"
layout="topleft"
top_pad="10"
left="0"
tab_stop="false"
multi_select="true"
name="viewable_objects_scroll_list"
width="835">
<scroll_list.columns
label="Object ID"
name="object_id"
width="225" />
<scroll_list.columns
label="Region"
name="region"
width="225" />
<scroll_list.columns
label="Local ID"
name="local_id"
width="70" />
<scroll_list.columns
label="Face"
name="face_index"
width="70" />
<scroll_list.columns
label="Material ID"
name="material_id"
dynamic_width="true" />
</scroll_list>
</panel>
<view_border
bevel_style="none"
follows="left|right|top"
height="0"
layout="topleft"
name="horiz_separator"
top_pad="10"
left="0"
width="1020"/>
<panel
border="false"
bevel_style="none"
follows="left|top|right"
layout="topleft"
height="457"
top_pad="10"
width="1020">
<button
follows="left|top"
height="22"
label="Post Material ID"
layout="topleft"
name="post_button"
top_pad="0"
width="214"/>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
height="135"
layout="topleft"
top_pad="10"
left="0"
tab_stop="false"
multi_select="false"
name="post_other_data_scroll_list"
width="775">
<scroll_list.columns
label="Material ID"
name="id"
dynamic_width="true" />
<scroll_list.columns
label="Specular Color"
name="specular_color"
width="120" />
<scroll_list.columns
label="Specular Exponent"
name="specular_exponent"
width="112" />
<scroll_list.columns
label="Env Intensity"
name="env_intensity"
width="80" />
<scroll_list.columns
label="Alpha Mask Cutoff"
name="alpha_mask_cutoff"
width="110" />
<scroll_list.columns
label="Diffuse Alpha Mode"
name="diffuse_alpha_mode"
width="118" />
</scroll_list>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
height="135"
layout="topleft"
top_pad="10"
tab_stop="false"
multi_select="false"
name="post_specular_map_scroll_list"
width="1020">
<scroll_list.columns
label="Material ID"
name="id"
dynamic_width="true" />
<scroll_list.columns
label="Specular Map"
name="specular_map_list_map"
width="225" />
<scroll_list.columns
label="Offset X"
name="specular_map_list_offset_x"
width="112" />
<scroll_list.columns
label="Offset Y"
name="specular_map_list_offset_y"
width="112" />
<scroll_list.columns
label="Repeat X"
name="specular_map_list_repeat_x"
width="112" />
<scroll_list.columns
label="Repeat Y"
name="specular_map_list_repeat_y"
width="112" />
<scroll_list.columns
label="Rotation"
name="specular_map_list_rotation"
width="112" />
</scroll_list>
<scroll_list
column_padding="0"
draw_heading="true"
follows="left|top|right"
height="135"
layout="topleft"
top_pad="10"
tab_stop="false"
multi_select="false"
name="post_normal_map_scroll_list"
width="1020">
<scroll_list.columns
label="Material ID"
name="id"
dynamic_width="true" />
<scroll_list.columns
label="Normal Map"
name="normal_map_list_map"
width="225" />
<scroll_list.columns
label="Offset X"
name="normal_map_list_offset_x"
width="112" />
<scroll_list.columns
label="Offset Y"
name="normal_map_list_offset_y"
width="112" />
<scroll_list.columns
label="Repeat X"
name="normal_map_list_repeat_x"
width="112" />
<scroll_list.columns
label="Repeat Y"
name="normal_map_list_repeat_y"
width="112" />
<scroll_list.columns
label="Rotation"
name="normal_map_list_rotation"
width="112" />
</scroll_list>
</panel>
</panel>
</panel>
</tab_container>
</floater>

10
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -2622,16 +2622,6 @@
<menu_item_separator/>
<menu_item_call
label="Debug materials ..."
name="DebugMaterialsMenu">
<menu_item_call.on_click
function="Floater.ToggleOrBringToFront"
parameter="floater_debug_materials" />
</menu_item_call>
<menu_item_separator />
<menu_item_check
label="Debug GL"
name="Debug GL">