diff options
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rw-r--r-- | indra/newview/llfloaterabout.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 8a51c155de..9e6dbccf0f 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -99,9 +99,8 @@ LLFloaterAbout::LLFloaterAbout() support.append( gSysCPU.getCPUString() ); support.append("\n"); - U32 memory = gSysMemory.getPhysicalMemory() / 1024 / 1024; - // For some reason, the reported amount of memory is always wrong by one meg - memory++; + U32 memory = gSysMemory.getPhysicalMemoryKB() / 1024; + // Moved hack adjustment to Windows memory size into llsys.cpp LLString mem_text = llformat("Memory: %u MB\n", memory ); support.append(mem_text); @@ -147,8 +146,15 @@ LLFloaterAbout::LLFloaterAbout() // Fix views childDisable("credits_editor"); - childDisable("support_editor"); - childSetText("support_editor", support); + + LLTextEditor * support_widget = (LLTextEditor *) getChildByName("support_editor", true); + if (support_widget) + { + support_widget->setEnabled( FALSE ); + support_widget->setTakesFocus( TRUE ); + support_widget->setText( support ); + support_widget->setHandleEditKeysDirectly( TRUE ); + } center(); |