diff options
| author | Richard Nelson <none@none> | 2010-04-30 17:01:41 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-04-30 17:01:41 -0700 |
| commit | abc6aef7804d0572c0b8ec469aa607f4dabfdad5 (patch) | |
| tree | 708b0ae4e6cda60793c8b4c48ca0107e0d5e9a12 /indra/newview | |
| parent | 7eaae1fe819aef7dc8ac20387e62c3d13ab6d72f (diff) | |
| parent | 0ea9fa8d9425cd89a6a8b01b6dc56696ea1b9033 (diff) | |
merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login.xml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 835a9aacd5..a1e3b679ee 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1588,7 +1588,10 @@ if (WINDOWS) --login_channel=${VIEWER_LOGIN_CHANNEL} --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat - DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + DEPENDS + ${VIEWER_BINARY_NAME} + ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py + ${COPY_INPUT_DEPENDENCIES} ) add_custom_target(package ALL DEPENDS diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index a725548e61..20bf618b64 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -13,7 +13,7 @@ top="600" </panel.string> <panel.string name="real_url" translate="false"> - http://secondlife.com/app/login/ + http://www.yahoo.com/ </panel.string> <string name="reg_in_client_url" translate="false"> http://secondlife.eniac15.lindenlab.com/reg-in-client/ |