From 81eb6f3925577cd46f1e9b16e5691dea62618703 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Mon, 8 Apr 2013 04:27:27 +1000 Subject: A little more 64 bit clean now. --- linden/indra/newview/llviewermenu.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 538adc7..f10910c 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -9088,7 +9088,7 @@ class LLAdvancedToggleRenderType : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 render_type = render_type_from_string( userdata.asString() ); + intptr_t render_type = render_type_from_string( userdata.asString() ); if ( render_type != 0 ) { LLPipeline::toggleRenderTypeControl( (void*)render_type ); @@ -9102,7 +9102,7 @@ class LLAdvancedCheckRenderType : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 render_type = render_type_from_string( userdata["data"].asString() ); + intptr_t render_type = render_type_from_string( userdata["data"].asString() ); bool new_value = false; if ( render_type != 0 ) @@ -9168,7 +9168,7 @@ class LLAdvancedToggleFeature : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 feature = feature_from_string( userdata.asString() ); + intptr_t feature = feature_from_string( userdata.asString() ); if ( feature != 0 ) { @@ -9184,7 +9184,7 @@ class LLAdvancedCheckFeature : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 feature = feature_from_string( userdata["data"].asString() ); + intptr_t feature = feature_from_string( userdata["data"].asString() ); bool new_value = false; if ( feature != 0 ) @@ -9290,7 +9290,7 @@ class LLAdvancedToggleInfoDisplay : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 info_display = info_display_from_string( userdata.asString() ); + intptr_t info_display = info_display_from_string( userdata.asString() ); if ( info_display != 0 ) { @@ -9306,7 +9306,7 @@ class LLAdvancedCheckInfoDisplay : public view_listener_t { bool handleEvent(LLPointer event, const LLSD& userdata) { - U32 info_display = info_display_from_string( userdata["data"].asString() ); + intptr_t info_display = info_display_from_string( userdata["data"].asString() ); bool new_value = false; if ( info_display != 0 ) -- cgit v1.1