diff options
| author | David Walter Seikel | 2013-04-08 04:27:27 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-04-08 04:27:27 +1000 |
| commit | 81eb6f3925577cd46f1e9b16e5691dea62618703 (patch) | |
| tree | 3ed03946d8506d1034cedc7681521adc0adc1e38 /linden | |
| parent | Material UUIDs are defined in two places, deleted one. (diff) | |
| download | meta-impy-81eb6f3925577cd46f1e9b16e5691dea62618703.zip meta-impy-81eb6f3925577cd46f1e9b16e5691dea62618703.tar.gz meta-impy-81eb6f3925577cd46f1e9b16e5691dea62618703.tar.bz2 meta-impy-81eb6f3925577cd46f1e9b16e5691dea62618703.tar.xz | |
A little more 64 bit clean now.
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llviewermenu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 | |||
| 9088 | { | 9088 | { |
| 9089 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 9089 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
| 9090 | { | 9090 | { |
| 9091 | U32 render_type = render_type_from_string( userdata.asString() ); | 9091 | intptr_t render_type = render_type_from_string( userdata.asString() ); |
| 9092 | if ( render_type != 0 ) | 9092 | if ( render_type != 0 ) |
| 9093 | { | 9093 | { |
| 9094 | LLPipeline::toggleRenderTypeControl( (void*)render_type ); | 9094 | LLPipeline::toggleRenderTypeControl( (void*)render_type ); |
| @@ -9102,7 +9102,7 @@ class LLAdvancedCheckRenderType : public view_listener_t | |||
| 9102 | { | 9102 | { |
| 9103 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 9103 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
| 9104 | { | 9104 | { |
| 9105 | U32 render_type = render_type_from_string( userdata["data"].asString() ); | 9105 | intptr_t render_type = render_type_from_string( userdata["data"].asString() ); |
| 9106 | bool new_value = false; | 9106 | bool new_value = false; |
| 9107 | 9107 | ||
| 9108 | if ( render_type != 0 ) | 9108 | if ( render_type != 0 ) |
| @@ -9168,7 +9168,7 @@ class LLAdvancedToggleFeature : public view_listener_t | |||
| 9168 | { | 9168 | { |
| 9169 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 9169 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
| 9170 | { | 9170 | { |
| 9171 | U32 feature = feature_from_string( userdata.asString() ); | 9171 | intptr_t feature = feature_from_string( userdata.asString() ); |
| 9172 | 9172 | ||
| 9173 | if ( feature != 0 ) | 9173 | if ( feature != 0 ) |
| 9174 | { | 9174 | { |
| @@ -9184,7 +9184,7 @@ class LLAdvancedCheckFeature : public view_listener_t | |||
| 9184 | { | 9184 | { |
| 9185 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 9185 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
| 9186 | { | 9186 | { |
| 9187 | U32 feature = feature_from_string( userdata["data"].asString() ); | 9187 | intptr_t feature = feature_from_string( userdata["data"].asString() ); |
| 9188 | bool new_value = false; | 9188 | bool new_value = false; |
| 9189 | 9189 | ||
| 9190 | if ( feature != 0 ) | 9190 | if ( feature != 0 ) |
| @@ -9290,7 +9290,7 @@ class LLAdvancedToggleInfoDisplay : public view_listener_t | |||
| 9290 | { | 9290 | { |
| 9291 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 9291 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
| 9292 | { | 9292 | { |
| 9293 | U32 info_display = info_display_from_string( userdata.asString() ); | 9293 | intptr_t info_display = info_display_from_string( userdata.asString() ); |
| 9294 | 9294 | ||
| 9295 | if ( info_display != 0 ) | 9295 | if ( info_display != 0 ) |
| 9296 | { | 9296 | { |
| @@ -9306,7 +9306,7 @@ class LLAdvancedCheckInfoDisplay : public view_listener_t | |||
| 9306 | { | 9306 | { |
| 9307 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) | 9307 | bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) |
| 9308 | { | 9308 | { |
| 9309 | U32 info_display = info_display_from_string( userdata["data"].asString() ); | 9309 | intptr_t info_display = info_display_from_string( userdata["data"].asString() ); |
| 9310 | bool new_value = false; | 9310 | bool new_value = false; |
| 9311 | 9311 | ||
| 9312 | if ( info_display != 0 ) | 9312 | if ( info_display != 0 ) |