diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-09 16:53:45 -0700 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-09 16:53:45 -0700 |
commit | 7eea1e20619ff6bfcd83e072c304aa1dcc3d3eeb (patch) | |
tree | e3a41946f3f7689d10bb08e2789642e109182f0b | |
parent | a8642c90dac302cf5d55be23343cc58d48a43b9a (diff) |
Removing legacy code now that the latest server builds have the additional normal and specular map fields.
-rw-r--r-- | indra/newview/llfloaterdebugmaterials.cpp | 157 |
1 files changed, 0 insertions, 157 deletions
diff --git a/indra/newview/llfloaterdebugmaterials.cpp b/indra/newview/llfloaterdebugmaterials.cpp index f91522eb22..f6af2b68fa 100644 --- a/indra/newview/llfloaterdebugmaterials.cpp +++ b/indra/newview/llfloaterdebugmaterials.cpp @@ -833,37 +833,6 @@ void LLFloaterDebugMaterials::parseGetResponse(const LLSD& pContent) llassert(materialData.get(MATERIALS_CAP_NORMAL_MAP_FIELD).isUUID()); const LLUUID &normalMapID = materialData.get(MATERIALS_CAP_NORMAL_MAP_FIELD).asUUID(); -#ifndef NEW_DATA_FIELDS_DEPLOYED_TO_SERVER - bool hasExtraData = materialData.has(MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD); - S32 normalMapOffsetX = 0; - S32 normalMapOffsetY = 0; - S32 normalMapRepeatX = 0; - S32 normalMapRepeatY = 0; - S32 normalMapRotation = 0; - - if (hasExtraData) - { - llassert(materialData.has(MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD)); - llassert(materialData.get(MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD).isInteger()); - normalMapOffsetX = materialData.get(MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD).asInteger(); - - llassert(materialData.has(MATERIALS_CAP_NORMAL_MAP_OFFSET_Y_FIELD)); - llassert(materialData.get(MATERIALS_CAP_NORMAL_MAP_OFFSET_Y_FIELD).isInteger()); - normalMapOffsetY = materialData.get(MATERIALS_CAP_NORMAL_MAP_OFFSET_Y_FIELD).asInteger(); - - llassert(materialData.has(MATERIALS_CAP_NORMAL_MAP_REPEAT_X_FIELD)); - llassert(materialData.get(MATERIALS_CAP_NORMAL_MAP_REPEAT_X_FIELD).isInteger()); - normalMapRepeatX = materialData.get(MATERIALS_CAP_NORMAL_MAP_REPEAT_X_FIELD).asInteger(); - - llassert(materialData.has(MATERIALS_CAP_NORMAL_MAP_REPEAT_Y_FIELD)); - llassert(materialData.get(MATERIALS_CAP_NORMAL_MAP_REPEAT_Y_FIELD).isInteger()); - normalMapRepeatY = materialData.get(MATERIALS_CAP_NORMAL_MAP_REPEAT_Y_FIELD).asInteger(); - - llassert(materialData.has(MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD)); - llassert(materialData.get(MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD).isInteger()); - normalMapRotation = materialData.get(MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD).asInteger(); - } -#else // NEW_DATA_FIELDS_DEPLOYED_TO_SERVER llassert(materialData.has(MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD)); llassert(materialData.get(MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD).isInteger()); S32 normalMapOffsetX = materialData.get(MATERIALS_CAP_NORMAL_MAP_OFFSET_X_FIELD).asInteger(); @@ -883,42 +852,11 @@ void LLFloaterDebugMaterials::parseGetResponse(const LLSD& pContent) llassert(materialData.has(MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD)); llassert(materialData.get(MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD).isInteger()); S32 normalMapRotation = materialData.get(MATERIALS_CAP_NORMAL_MAP_ROTATION_FIELD).asInteger(); -#endif // NEW_DATA_FIELDS_DEPLOYED_TO_SERVER llassert(materialData.has(MATERIALS_CAP_SPECULAR_MAP_FIELD)); llassert(materialData.get(MATERIALS_CAP_SPECULAR_MAP_FIELD).isUUID()); const LLUUID &specularMapID = materialData.get(MATERIALS_CAP_SPECULAR_MAP_FIELD).asUUID(); -#ifndef NEW_DATA_FIELDS_DEPLOYED_TO_SERVER - S32 specularMapOffsetX = 0; - S32 specularMapOffsetY = 0; - S32 specularMapRepeatX = 0; - S32 specularMapRepeatY = 0; - S32 specularMapRotation = 0; - - if (hasExtraData) - { - llassert(materialData.has(MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD)); - llassert(materialData.get(MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD).isInteger()); - specularMapOffsetX = materialData.get(MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD).asInteger(); - - llassert(materialData.has(MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD)); - llassert(materialData.get(MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD).isInteger()); - specularMapOffsetY = materialData.get(MATERIALS_CAP_SPECULAR_MAP_OFFSET_Y_FIELD).asInteger(); - - llassert(materialData.has(MATERIALS_CAP_SPECULAR_MAP_REPEAT_X_FIELD)); - llassert(materialData.get(MATERIALS_CAP_SPECULAR_MAP_REPEAT_X_FIELD).isInteger()); - specularMapRepeatX = materialData.get(MATERIALS_CAP_SPECULAR_MAP_REPEAT_X_FIELD).asInteger(); - - llassert(materialData.has(MATERIALS_CAP_SPECULAR_MAP_REPEAT_Y_FIELD)); - llassert(materialData.get(MATERIALS_CAP_SPECULAR_MAP_REPEAT_Y_FIELD).isInteger()); - specularMapRepeatY = materialData.get(MATERIALS_CAP_SPECULAR_MAP_REPEAT_Y_FIELD).asInteger(); - - llassert(materialData.has(MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD)); - llassert(materialData.get(MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD).isInteger()); - specularMapRotation = materialData.get(MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD).asInteger(); - } -#else // NEW_DATA_FIELDS_DEPLOYED_TO_SERVER llassert(materialData.has(MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD)); llassert(materialData.get(MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD).isInteger()); S32 specularMapOffsetX = materialData.get(MATERIALS_CAP_SPECULAR_MAP_OFFSET_X_FIELD).asInteger(); @@ -938,7 +876,6 @@ void LLFloaterDebugMaterials::parseGetResponse(const LLSD& pContent) llassert(materialData.has(MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD)); llassert(materialData.get(MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD).isInteger()); S32 specularMapRotation = materialData.get(MATERIALS_CAP_SPECULAR_MAP_ROTATION_FIELD).asInteger(); -#endif // NEW_DATA_FIELDS_DEPLOYED_TO_SERVER llassert(materialData.has(MATERIALS_CAP_SPECULAR_COLOR_FIELD)); llassert(materialData.get(MATERIALS_CAP_SPECULAR_COLOR_FIELD).isArray()); @@ -975,52 +912,6 @@ void LLFloaterDebugMaterials::parseGetResponse(const LLSD& pContent) cellParams.font = LLFontGL::getFontSansSerif(); -#ifndef NEW_DATA_FIELDS_DEPLOYED_TO_SERVER - if (hasExtraData) - { - cellParams.column = "normal_map_list_offset_x"; - cellParams.value = llformat("%d", normalMapOffsetX); - normalMapRowParams.columns.add(cellParams); - - cellParams.column = "normal_map_list_offset_y"; - cellParams.value = llformat("%d", normalMapOffsetY); - normalMapRowParams.columns.add(cellParams); - - cellParams.column = "normal_map_list_repeat_x"; - cellParams.value = llformat("%d", normalMapRepeatX); - normalMapRowParams.columns.add(cellParams); - - cellParams.column = "normal_map_list_repeat_y"; - cellParams.value = llformat("%d", normalMapRepeatY); - normalMapRowParams.columns.add(cellParams); - - cellParams.column = "normal_map_list_rotation"; - cellParams.value = llformat("%d", normalMapRotation); - normalMapRowParams.columns.add(cellParams); - } - else - { - cellParams.column = "normal_map_list_offset_x"; - cellParams.value = "--"; - normalMapRowParams.columns.add(cellParams); - - cellParams.column = "normal_map_list_offset_y"; - cellParams.value = "--"; - normalMapRowParams.columns.add(cellParams); - - cellParams.column = "normal_map_list_repeat_x"; - cellParams.value = "--"; - normalMapRowParams.columns.add(cellParams); - - cellParams.column = "normal_map_list_repeat_y"; - cellParams.value = "--"; - normalMapRowParams.columns.add(cellParams); - - cellParams.column = "normal_map_list_rotation"; - cellParams.value = "--"; - normalMapRowParams.columns.add(cellParams); - } -#else // NEW_DATA_FIELDS_DEPLOYED_TO_SERVER cellParams.column = "normal_map_list_offset_x"; cellParams.value = llformat("%d", normalMapOffsetX); normalMapRowParams.columns.add(cellParams); @@ -1040,7 +931,6 @@ void LLFloaterDebugMaterials::parseGetResponse(const LLSD& pContent) cellParams.column = "normal_map_list_rotation"; cellParams.value = llformat("%d", normalMapRotation); normalMapRowParams.columns.add(cellParams); -#endif // NEW_DATA_FIELDS_DEPLOYED_TO_SERVER cellParams.font = LLFontGL::getFontMonospace(); @@ -1050,52 +940,6 @@ void LLFloaterDebugMaterials::parseGetResponse(const LLSD& pContent) cellParams.font = LLFontGL::getFontSansSerif(); -#ifndef NEW_DATA_FIELDS_DEPLOYED_TO_SERVER - if (hasExtraData) - { - cellParams.column = "specular_map_list_offset_x"; - cellParams.value = llformat("%d", specularMapOffsetX); - specularMapRowParams.columns.add(cellParams); - - cellParams.column = "specular_map_list_offset_y"; - cellParams.value = llformat("%d", specularMapOffsetY); - specularMapRowParams.columns.add(cellParams); - - cellParams.column = "specular_map_list_repeat_x"; - cellParams.value = llformat("%d", specularMapRepeatX); - specularMapRowParams.columns.add(cellParams); - - cellParams.column = "specular_map_list_repeat_y"; - cellParams.value = llformat("%d", specularMapRepeatY); - specularMapRowParams.columns.add(cellParams); - - cellParams.column = "specular_map_list_rotation"; - cellParams.value = llformat("%d", specularMapRotation); - specularMapRowParams.columns.add(cellParams); - } - else - { - cellParams.column = "specular_map_list_offset_x"; - cellParams.value = "--"; - specularMapRowParams.columns.add(cellParams); - - cellParams.column = "specular_map_list_offset_y"; - cellParams.value = "--"; - specularMapRowParams.columns.add(cellParams); - - cellParams.column = "specular_map_list_repeat_x"; - cellParams.value = "--"; - specularMapRowParams.columns.add(cellParams); - - cellParams.column = "specular_map_list_repeat_y"; - cellParams.value = "--"; - specularMapRowParams.columns.add(cellParams); - - cellParams.column = "specular_map_list_rotation"; - cellParams.value = "--"; - specularMapRowParams.columns.add(cellParams); - } -#else // NEW_DATA_FIELDS_DEPLOYED_TO_SERVER cellParams.column = "specular_map_list_offset_x"; cellParams.value = llformat("%d", specularMapOffsetX); specularMapRowParams.columns.add(cellParams); @@ -1115,7 +959,6 @@ void LLFloaterDebugMaterials::parseGetResponse(const LLSD& pContent) cellParams.column = "specular_map_list_rotation"; cellParams.value = llformat("%d", specularMapRotation); specularMapRowParams.columns.add(cellParams); -#endif // NEW_DATA_FIELDS_DEPLOYED_TO_SERVER cellParams.column = "specular_color"; cellParams.value = llformat("(%d, %d, %d, %d)", specularColor.mV[0], |