diff options
author | David Seikel | 2011-02-09 01:57:04 +1000 |
---|---|---|
committer | David Seikel | 2011-02-09 01:57:04 +1000 |
commit | 6a87cef1d449e8cdf8ebac53994a9a032792cf92 (patch) | |
tree | c6f129866713b590e2a02e2199f5b6fd8595438e | |
parent | Merge branch 'branding' of github.com:onefang/meta-impy into branding (diff) | |
download | meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.zip meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.gz meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.bz2 meta-impy-6a87cef1d449e8cdf8ebac53994a9a032792cf92.tar.xz |
Change imprudence -> meta-impy, though not the URLs. Probably some will need to be reverted later.
Changed file names to.
50 files changed, 244 insertions, 244 deletions
@@ -14,7 +14,7 @@ linden/indra/newview/lib/ | |||
14 | linden/indra/newview/dbghelp.dll | 14 | linden/indra/newview/dbghelp.dll |
15 | linden/indra/newview/linux_tools/client-readme-voice.txt | 15 | linden/indra/newview/linux_tools/client-readme-voice.txt |
16 | linden/indra/newview/vivox-runtime/ | 16 | linden/indra/newview/vivox-runtime/ |
17 | linden/indra/newview/*.lproj/ | 17 | # linden/indra/newview/*.lproj/ |
18 | linden/indra/newview/mozilla-theme/ | 18 | linden/indra/newview/mozilla-theme/ |
19 | linden/indra/test_apps/ | 19 | linden/indra/test_apps/ |
20 | 20 | ||
diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt index 64e0079..5ef5d2c 100644 --- a/linden/indra/CMakeLists.txt +++ b/linden/indra/CMakeLists.txt | |||
@@ -12,8 +12,8 @@ if (COMMAND cmake_policy) | |||
12 | cmake_policy(SET CMP0003 OLD) | 12 | cmake_policy(SET CMP0003 OLD) |
13 | endif (COMMAND cmake_policy) | 13 | endif (COMMAND cmake_policy) |
14 | 14 | ||
15 | set(ROOT_PROJECT_NAME "Imprudence" CACHE STRING | 15 | set(ROOT_PROJECT_NAME "meta-impy" CACHE STRING |
16 | "The root project/makefile/solution name. Defaults to Imprudence.") | 16 | "The root project/makefile/solution name. Defaults to meta-impy.") |
17 | project(${ROOT_PROJECT_NAME}) | 17 | project(${ROOT_PROJECT_NAME}) |
18 | 18 | ||
19 | set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") | 19 | set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") |
@@ -91,7 +91,7 @@ if (VIEWER) | |||
91 | endif (LINUX) | 91 | endif (LINUX) |
92 | 92 | ||
93 | add_subdirectory(${VIEWER_PREFIX}newview) | 93 | add_subdirectory(${VIEWER_PREFIX}newview) |
94 | add_dependencies(viewer imprudence-bin) | 94 | add_dependencies(viewer meta-impy-bin) |
95 | endif (VIEWER) | 95 | endif (VIEWER) |
96 | 96 | ||
97 | # Linux builds the viewer and server in 2 separate projects | 97 | # Linux builds the viewer and server in 2 separate projects |
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake index 7e85ce0..0528f2a 100644 --- a/linden/indra/cmake/00-Common.cmake +++ b/linden/indra/cmake/00-Common.cmake | |||
@@ -169,7 +169,7 @@ if (LINUX) | |||
169 | endif (SERVER) | 169 | endif (SERVER) |
170 | 170 | ||
171 | if (VIEWER) | 171 | if (VIEWER) |
172 | add_definitions(-DAPPID=imprudence) | 172 | add_definitions(-DAPPID=meta-impy) |
173 | add_definitions(-fvisibility=hidden) | 173 | add_definitions(-fvisibility=hidden) |
174 | # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. | 174 | # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work. Sigh! The viewer doesn't need to catch SIGCHLD anyway. |
175 | add_definitions(-DLL_IGNORE_SIGCHLD) | 175 | add_definitions(-DLL_IGNORE_SIGCHLD) |
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake index f584689..b4becf7 100644 --- a/linden/indra/cmake/CopyWinLibs.cmake +++ b/linden/indra/cmake/CopyWinLibs.cmake | |||
@@ -1,7 +1,7 @@ | |||
1 | # -*- cmake -*- | 1 | # -*- cmake -*- |
2 | 2 | ||
3 | # The copy_win_libs folder contains file lists and a script used to | 3 | # The copy_win_libs folder contains file lists and a script used to |
4 | # copy dlls, exes and such needed to run Imprudence from within | 4 | # copy dlls, exes and such needed to run meta-impy from within |
5 | # VisualStudio. | 5 | # VisualStudio. |
6 | 6 | ||
7 | include(CMakeCopyIfDifferent) | 7 | include(CMakeCopyIfDifferent) |
@@ -282,7 +282,7 @@ if(EXISTS ${debug_msvc8_redist_path}) | |||
282 | ARGS | 282 | ARGS |
283 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 283 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
284 | ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest | 284 | ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest |
285 | ${CMAKE_CURRENT_SOURCE_DIR}/ImprudenceDebug.exe.config | 285 | ${CMAKE_CURRENT_SOURCE_DIR}/meta-impyDebug.exe.config |
286 | ${debug_appconfig_file} | 286 | ${debug_appconfig_file} |
287 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest | 287 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Debug/Microsoft.VC80.DebugCRT.manifest |
288 | COMMENT "Creating debug app config file" | 288 | COMMENT "Creating debug app config file" |
@@ -327,7 +327,7 @@ if(EXISTS ${release_msvc8_redist_path}) | |||
327 | ARGS | 327 | ARGS |
328 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 328 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
329 | ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest | 329 | ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest |
330 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config | 330 | ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config |
331 | ${release_appconfig_file} | 331 | ${release_appconfig_file} |
332 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest | 332 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Release/Microsoft.VC80.CRT.manifest |
333 | COMMENT "Creating release app config file" | 333 | COMMENT "Creating release app config file" |
@@ -340,7 +340,7 @@ if(EXISTS ${release_msvc8_redist_path}) | |||
340 | ARGS | 340 | ARGS |
341 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py | 341 | ${CMAKE_CURRENT_SOURCE_DIR}/build_win32_appConfig.py |
342 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 342 | ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
343 | ${CMAKE_CURRENT_SOURCE_DIR}/Imprudence.exe.config | 343 | ${CMAKE_CURRENT_SOURCE_DIR}/meta-impy.exe.config |
344 | ${relwithdebinfo_appconfig_file} | 344 | ${relwithdebinfo_appconfig_file} |
345 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest | 345 | DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/Microsoft.VC80.CRT.manifest |
346 | COMMENT "Creating relwithdebinfo app config file" | 346 | COMMENT "Creating relwithdebinfo app config file" |
diff --git a/linden/indra/cmake/UnixInstall.cmake b/linden/indra/cmake/UnixInstall.cmake index 0234dee..73f6714 100644 --- a/linden/indra/cmake/UnixInstall.cmake +++ b/linden/indra/cmake/UnixInstall.cmake | |||
@@ -21,11 +21,11 @@ if (INSTALL) | |||
21 | set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH | 21 | set(INSTALL_SHARE_DIR ${INSTALL_PREFIX}/share CACHE PATH |
22 | "Installation directory for read-only shared files.") | 22 | "Installation directory for read-only shared files.") |
23 | 23 | ||
24 | set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/imprudence-${viewer_VERSION} | 24 | set(APP_BINARY_DIR ${INSTALL_LIBRARY_DIR}/meta-impy-${viewer_VERSION} |
25 | CACHE PATH | 25 | CACHE PATH |
26 | "Installation directory for binaries.") | 26 | "Installation directory for binaries.") |
27 | 27 | ||
28 | set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/imprudence-${viewer_VERSION} | 28 | set(APP_SHARE_DIR ${INSTALL_SHARE_DIR}/meta-impy-${viewer_VERSION} |
29 | CACHE PATH | 29 | CACHE PATH |
30 | "Installation directory for read-only data files.") | 30 | "Installation directory for read-only data files.") |
31 | endif (INSTALL) | 31 | endif (INSTALL) |
diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake index eb9c004..37e77ae 100644 --- a/linden/indra/cmake/Variables.cmake +++ b/linden/indra/cmake/Variables.cmake | |||
@@ -74,10 +74,10 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") | |||
74 | set(GRID agni CACHE STRING "Target Grid") | 74 | set(GRID agni CACHE STRING "Target Grid") |
75 | 75 | ||
76 | set(VIEWER ON CACHE BOOL "Build Second Life viewer.") | 76 | set(VIEWER ON CACHE BOOL "Build Second Life viewer.") |
77 | set(VIEWER_CHANNEL "Imprudence" CACHE STRING "Viewer Channel Name") | 77 | set(VIEWER_CHANNEL "meta-impy" CACHE STRING "Viewer Channel Name") |
78 | set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") | 78 | set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for A/B Testing") |
79 | 79 | ||
80 | set(STANDALONE OFF CACHE BOOL "Do not use Imprudence-supplied prebuilt libraries.") | 80 | set(STANDALONE OFF CACHE BOOL "Do not use meta-impy-supplied prebuilt libraries.") |
81 | 81 | ||
82 | if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) | 82 | if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) |
83 | set(SERVER ON CACHE BOOL "Build Second Life server software.") | 83 | set(SERVER ON CACHE BOOL "Build Second Life server software.") |
diff --git a/linden/indra/copy_win_scripts/start-client.py b/linden/indra/copy_win_scripts/start-client.py index ea2b67a..036468f 100755 --- a/linden/indra/copy_win_scripts/start-client.py +++ b/linden/indra/copy_win_scripts/start-client.py | |||
@@ -32,7 +32,7 @@ def start_client(grid, slurl, build_config, my_args): | |||
32 | f = open("start-client.log", "w") | 32 | f = open("start-client.log", "w") |
33 | print >>f, "Viewer startup arguments:" | 33 | print >>f, "Viewer startup arguments:" |
34 | llstart.start("viewer", "../../newview", | 34 | llstart.start("viewer", "../../newview", |
35 | "%s/newview/%s/imprudence-bin.exe" % (build_path, build_config), | 35 | "%s/newview/%s/meta-impy-bin.exe" % (build_path, build_config), |
36 | viewer_args, f) | 36 | viewer_args, f) |
37 | f.close() | 37 | f.close() |
38 | 38 | ||
diff --git a/linden/indra/develop.py b/linden/indra/develop.py index 6fe565e..c909a1b 100755 --- a/linden/indra/develop.py +++ b/linden/indra/develop.py | |||
@@ -77,7 +77,7 @@ class PlatformSetup(object): | |||
77 | standalone = 'OFF' | 77 | standalone = 'OFF' |
78 | unattended = 'OFF' | 78 | unattended = 'OFF' |
79 | universal = 'OFF' | 79 | universal = 'OFF' |
80 | project_name = 'Imprudence' | 80 | project_name = 'meta-impy' |
81 | distcc = True | 81 | distcc = True |
82 | cmake_opts = [] | 82 | cmake_opts = [] |
83 | 83 | ||
@@ -632,9 +632,9 @@ class WindowsSetup(PlatformSetup): | |||
632 | continue | 632 | continue |
633 | vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') + | 633 | vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') + |
634 | ' --solution ' + | 634 | ' --solution ' + |
635 | os.path.join(build_dir,'Imprudence.sln') + | 635 | os.path.join(build_dir,'meta-impy.sln') + |
636 | ' --config ' + self.build_type + | 636 | ' --config ' + self.build_type + |
637 | ' --startup imprudence-bin') | 637 | ' --startup meta-impy-bin') |
638 | print 'Running %r in %r' % (vstool_cmd, getcwd()) | 638 | print 'Running %r in %r' % (vstool_cmd, getcwd()) |
639 | self.run(vstool_cmd) | 639 | self.run(vstool_cmd) |
640 | print >> open(stamp, 'w'), self.build_type | 640 | print >> open(stamp, 'w'), self.build_type |
diff --git a/linden/indra/lib/python/indra/util/llmanifest.py b/linden/indra/lib/python/indra/util/llmanifest.py index fc777b2..f82394d 100644 --- a/linden/indra/lib/python/indra/util/llmanifest.py +++ b/linden/indra/lib/python/indra/util/llmanifest.py | |||
@@ -99,7 +99,7 @@ def get_channel(srctree): | |||
99 | 99 | ||
100 | 100 | ||
101 | DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) | 101 | DEFAULT_SRCTREE = os.path.dirname(sys.argv[0]) |
102 | DEFAULT_CHANNEL = 'Imprudence' | 102 | DEFAULT_CHANNEL = 'meta-impy' |
103 | 103 | ||
104 | ARGUMENTS=[ | 104 | ARGUMENTS=[ |
105 | dict(name='actions', | 105 | dict(name='actions', |
@@ -163,7 +163,7 @@ ARGUMENTS=[ | |||
163 | for use by a .bat file.""", | 163 | for use by a .bat file.""", |
164 | default=None), | 164 | default=None), |
165 | dict(name='version', | 165 | dict(name='version', |
166 | description="""This specifies the version of Imprudence that is | 166 | description="""This specifies the version of meta-impy that is |
167 | being packaged up.""", | 167 | being packaged up.""", |
168 | default=get_default_version) | 168 | default=get_default_version) |
169 | ] | 169 | ] |
diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp index a275ffc..7cd402d 100644 --- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp +++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp | |||
@@ -54,13 +54,13 @@ | |||
54 | 54 | ||
55 | // These need to be localized. | 55 | // These need to be localized. |
56 | static const char dialog_text[] = | 56 | static const char dialog_text[] = |
57 | "Imprudence appears to have crashed or frozen last time it ran.\n" | 57 | "meta-impy appears to have crashed or frozen last time it ran.\n" |
58 | "This crash reporter collects information about your computer's hardware, operating system, and some Imprudence logs, all of which are used for debugging purposes only.\n" | 58 | "This crash reporter collects information about your computer's hardware, operating system, and some meta-impy logs, all of which are used for debugging purposes only.\n" |
59 | "\n" | 59 | "\n" |
60 | "Send crash report?"; | 60 | "Send crash report?"; |
61 | 61 | ||
62 | static const char dialog_title[] = | 62 | static const char dialog_title[] = |
63 | "Imprudence Crash Logger"; | 63 | "meta-impy0 Crash Logger"; |
64 | 64 | ||
65 | #if LL_GTK | 65 | #if LL_GTK |
66 | static void response_callback (GtkDialog *dialog, | 66 | static void response_callback (GtkDialog *dialog, |
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index ab74a3f..ad6a88a 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h | |||
@@ -44,11 +44,11 @@ const char * const LL_VIEWER_NAME = "Second Life"; | |||
44 | 44 | ||
45 | // These aren't used anymore. | 45 | // These aren't used anymore. |
46 | // The channel is ViewerChannelName in settings.xml | 46 | // The channel is ViewerChannelName in settings.xml |
47 | // The Imprudence version is set in app_settings\viewerversion.xml -- MC | 47 | // The meta-impy version is set in app_settings\viewerversion.xml -- MC |
48 | 48 | ||
49 | /*const char * const LL_CHANNEL = "Imprudence"; | 49 | /*const char * const LL_CHANNEL = "meta-impy"; |
50 | 50 | ||
51 | const char * const IMP_VIEWER_NAME = "Imprudence"; | 51 | const char * const IMP_VIEWER_NAME = "meta-impy"; |
52 | 52 | ||
53 | const S32 IMP_VERSION_MAJOR = 1; | 53 | const S32 IMP_VERSION_MAJOR = 1; |
54 | const S32 IMP_VERSION_MINOR = 3; | 54 | const S32 IMP_VERSION_MINOR = 3; |
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp index d25be55..aac5592 100755 --- a/linden/indra/llcrashlogger/llcrashlogger.cpp +++ b/linden/indra/llcrashlogger/llcrashlogger.cpp | |||
@@ -203,7 +203,7 @@ void LLCrashLogger::gatherFiles() | |||
203 | { | 203 | { |
204 | // Figure out the filename of the second life log | 204 | // Figure out the filename of the second life log |
205 | LLCurl::setCAFile(gDirUtilp->getCAFile()); | 205 | LLCurl::setCAFile(gDirUtilp->getCAFile()); |
206 | mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.log"); | 206 | mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"meta-impy.log"); |
207 | mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml"); | 207 | mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml"); |
208 | } | 208 | } |
209 | 209 | ||
@@ -335,7 +335,7 @@ bool LLCrashLogger::sendCrashLogs() | |||
335 | updateApplication("Sending reports..."); | 335 | updateApplication("Sending reports..."); |
336 | 336 | ||
337 | std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, | 337 | std::string dump_path = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, |
338 | "ImprudenceCrashReport"); | 338 | "meta-impyCrashReport"); |
339 | std::string report_file = dump_path + ".log"; | 339 | std::string report_file = dump_path + ".log"; |
340 | 340 | ||
341 | std::ofstream out_file(report_file.c_str()); | 341 | std::ofstream out_file(report_file.c_str()); |
@@ -369,10 +369,10 @@ void LLCrashLogger::updateApplication(const std::string& message) | |||
369 | bool LLCrashLogger::init() | 369 | bool LLCrashLogger::init() |
370 | { | 370 | { |
371 | // We assume that all the logs we're looking for reside on the current drive | 371 | // We assume that all the logs we're looking for reside on the current drive |
372 | gDirUtilp->initAppDirs("Imprudence"); | 372 | gDirUtilp->initAppDirs("meta-impy"); |
373 | 373 | ||
374 | // Default to the product name "Imprudence" (this is overridden by the -name argument) | 374 | // Default to the product name "meta-impy" (this is overridden by the -name argument) |
375 | mProductName = "Imprudence"; | 375 | mProductName = "meta-impy"; |
376 | 376 | ||
377 | mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes " | 377 | mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes " |
378 | "(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)"); | 378 | "(0 = ask before sending crash report, 1 = always send crash report, 2 = never send crash report)"); |
@@ -394,7 +394,7 @@ bool LLCrashLogger::init() | |||
394 | //If we've opened the crash logger, assume we can delete the marker file if it exists | 394 | //If we've opened the crash logger, assume we can delete the marker file if it exists |
395 | if( gDirUtilp ) | 395 | if( gDirUtilp ) |
396 | { | 396 | { |
397 | std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.exec_marker"); | 397 | std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"meta-impy.exec_marker"); |
398 | LLAPRFile::remove( marker_file ); | 398 | LLAPRFile::remove( marker_file ); |
399 | } | 399 | } |
400 | 400 | ||
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp index 0c93cbb..dbb057f 100644 --- a/linden/indra/llvfs/lldir.cpp +++ b/linden/indra/llvfs/lldir.cpp | |||
@@ -249,7 +249,7 @@ std::string LLDir::buildSLOSCacheDir() const | |||
249 | } | 249 | } |
250 | else | 250 | else |
251 | { | 251 | { |
252 | res = getOSCacheDir() + mDirDelimiter + "ImprudenceExperimental"; | 252 | res = getOSCacheDir() + mDirDelimiter + "meta-impyExperimental"; |
253 | } | 253 | } |
254 | return res; | 254 | return res; |
255 | } | 255 | } |
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp index 6f0b037..7fb235b 100644 --- a/linden/indra/llvfs/lldir_mac.cpp +++ b/linden/indra/llvfs/lldir_mac.cpp | |||
@@ -122,7 +122,7 @@ LLDir_Mac::LLDir_Mac() | |||
122 | CFStringRef stringRef = NULL; | 122 | CFStringRef stringRef = NULL; |
123 | OSStatus error = noErr; | 123 | OSStatus error = noErr; |
124 | FSRef fileRef; | 124 | FSRef fileRef; |
125 | CFStringRef secondLifeString = CFSTR("Imprudence"); | 125 | CFStringRef secondLifeString = CFSTR("meta-impy"); |
126 | 126 | ||
127 | mainBundleRef = CFBundleGetMainBundle(); | 127 | mainBundleRef = CFBundleGetMainBundle(); |
128 | 128 | ||
@@ -173,7 +173,7 @@ LLDir_Mac::LLDir_Mac() | |||
173 | if (error == noErr) | 173 | if (error == noErr) |
174 | { | 174 | { |
175 | FSRefToLLString(&cacheDirRef, mOSCacheDir); | 175 | FSRefToLLString(&cacheDirRef, mOSCacheDir); |
176 | (void)CFCreateDirectory(&cacheDirRef, CFSTR("ImprudenceExperimental"),NULL); | 176 | (void)CFCreateDirectory(&cacheDirRef, CFSTR("meta-impyExperimental"),NULL); |
177 | } | 177 | } |
178 | 178 | ||
179 | // mOSUserAppDir | 179 | // mOSUserAppDir |
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp index f7d7587..1933888 100644 --- a/linden/indra/llwindow/llwindowsdl.cpp +++ b/linden/indra/llwindow/llwindowsdl.cpp | |||
@@ -469,7 +469,7 @@ BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, B | |||
469 | 469 | ||
470 | // Set the application icon. | 470 | // Set the application icon. |
471 | SDL_Surface *bmpsurface; | 471 | SDL_Surface *bmpsurface; |
472 | bmpsurface = Load_BMP_Resource("imprudence_icon.BMP"); | 472 | bmpsurface = Load_BMP_Resource("meta-impy_icon.BMP"); |
473 | if (bmpsurface) | 473 | if (bmpsurface) |
474 | { | 474 | { |
475 | // This attempts to give a black-keyed mask to the icon. | 475 | // This attempts to give a black-keyed mask to the icon. |
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp index cf9de4b..64afff8 100644 --- a/linden/indra/mac_updater/mac_updater.cpp +++ b/linden/indra/mac_updater/mac_updater.cpp | |||
@@ -379,7 +379,7 @@ int main(int argc, char **argv) | |||
379 | } | 379 | } |
380 | else | 380 | else |
381 | { | 381 | { |
382 | gProductName = "Imprudence"; | 382 | gProductName = "meta-impy"; |
383 | } | 383 | } |
384 | } | 384 | } |
385 | 385 | ||
@@ -472,7 +472,7 @@ int main(int argc, char **argv) | |||
472 | err = CreateStandardAlert( | 472 | err = CreateStandardAlert( |
473 | kAlertStopAlert, | 473 | kAlertStopAlert, |
474 | CFSTR("Error"), | 474 | CFSTR("Error"), |
475 | CFSTR("An error occurred while updating Imprudence. Please download the latest version from http://imprudenceviewer.org/download/"), | 475 | CFSTR("An error occurred while updating meta-impy. Please download the latest version from http://imprudenceviewer.org/download/"), |
476 | ¶ms, | 476 | ¶ms, |
477 | &alert); | 477 | &alert); |
478 | 478 | ||
@@ -935,7 +935,7 @@ void *updatethreadproc(void*) | |||
935 | 935 | ||
936 | #endif // 0 *HACK for DEV-11935 | 936 | #endif // 0 *HACK for DEV-11935 |
937 | 937 | ||
938 | strncat(temp, "/ImprudenceUpdate_XXXXXX", (sizeof(temp) - strlen(temp)) - 1); | 938 | strncat(temp, "/meta-impyUpdate_XXXXXX", (sizeof(temp) - strlen(temp)) - 1); |
939 | if(mkdtemp(temp) == NULL) | 939 | if(mkdtemp(temp) == NULL) |
940 | { | 940 | { |
941 | throw 0; | 941 | throw 0; |
@@ -953,7 +953,7 @@ void *updatethreadproc(void*) | |||
953 | 953 | ||
954 | chdir(tempDir); | 954 | chdir(tempDir); |
955 | 955 | ||
956 | snprintf(temp, sizeof(temp), "Imprudence.dmg"); | 956 | snprintf(temp, sizeof(temp), "meta-impy.dmg"); |
957 | 957 | ||
958 | downloadFile = LLFile::fopen(temp, "wb"); /* Flawfinder: ignore */ | 958 | downloadFile = LLFile::fopen(temp, "wb"); /* Flawfinder: ignore */ |
959 | if(downloadFile == NULL) | 959 | if(downloadFile == NULL) |
@@ -1000,7 +1000,7 @@ void *updatethreadproc(void*) | |||
1000 | // NOTE: we could add -private at the end of this command line to keep the image from showing up in the Finder, | 1000 | // NOTE: we could add -private at the end of this command line to keep the image from showing up in the Finder, |
1001 | // but if our cleanup fails, this makes it much harder for the user to unmount the image. | 1001 | // but if our cleanup fails, this makes it much harder for the user to unmount the image. |
1002 | std::string mountOutput; | 1002 | std::string mountOutput; |
1003 | FILE* mounter = popen("hdiutil attach Imprudence.dmg -mountpoint mnt", "r"); /* Flawfinder: ignore */ | 1003 | FILE* mounter = popen("hdiutil attach meta-impy.dmg -mountpoint mnt", "r"); /* Flawfinder: ignore */ |
1004 | 1004 | ||
1005 | if(mounter == NULL) | 1005 | if(mounter == NULL) |
1006 | { | 1006 | { |
diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp index ed6d920..3637f6b 100755 --- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp +++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp | |||
@@ -945,7 +945,7 @@ void MediaPluginGStreamer010::set_gst_plugin_path() | |||
945 | return; | 945 | return; |
946 | } | 946 | } |
947 | 947 | ||
948 | DEBUGMSG("Imprudence is installed at %s", imp_dir); | 948 | DEBUGMSG("meta-impy is installed at %s", imp_dir); |
949 | 949 | ||
950 | // ":" on Mac and 'Nix, ";" on Windows | 950 | // ":" on Mac and 'Nix, ";" on Windows |
951 | std::string separator = G_SEARCHPATH_SEPARATOR_S; | 951 | std::string separator = G_SEARCHPATH_SEPARATOR_S; |
@@ -963,7 +963,7 @@ void MediaPluginGStreamer010::set_gst_plugin_path() | |||
963 | } | 963 | } |
964 | 964 | ||
965 | 965 | ||
966 | // Search both Imprudence and Imprudence\lib\gstreamer-plugins. | 966 | // Search both meta-impy and meta-impy\lib\gstreamer-plugins. |
967 | // But we also want to search the path the user has set, if any. | 967 | // But we also want to search the path the user has set, if any. |
968 | std::string plugin_path = | 968 | std::string plugin_path = |
969 | "GST_PLUGIN_PATH=" + | 969 | "GST_PLUGIN_PATH=" + |
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt index ed6ac78..c7d46c2 100644 --- a/linden/indra/newview/CMakeLists.txt +++ b/linden/indra/newview/CMakeLists.txt | |||
@@ -503,7 +503,7 @@ set(viewer_SOURCE_FILES | |||
503 | wlsettingsmanager.cpp | 503 | wlsettingsmanager.cpp |
504 | ) | 504 | ) |
505 | 505 | ||
506 | set(VIEWER_BINARY_NAME "imprudence-bin" CACHE STRING | 506 | set(VIEWER_BINARY_NAME "meta-impy-bin" CACHE STRING |
507 | "The name of the viewer executable to create.") | 507 | "The name of the viewer executable to create.") |
508 | 508 | ||
509 | if (LINUX) | 509 | if (LINUX) |
@@ -993,8 +993,8 @@ if (DARWIN) | |||
993 | viewer.icns | 993 | viewer.icns |
994 | macview.r | 994 | macview.r |
995 | gpu_table.txt | 995 | gpu_table.txt |
996 | Info-Imprudence.plist | 996 | Info-meta-impy.plist |
997 | Imprudence.nib/ | 997 | meta-impy.nib/ |
998 | # CMake doesn't seem to support Xcode language variants well just yet | 998 | # CMake doesn't seem to support Xcode language variants well just yet |
999 | English.lproj/InfoPlist.strings | 999 | English.lproj/InfoPlist.strings |
1000 | English.lproj/language.txt | 1000 | English.lproj/language.txt |
@@ -1060,7 +1060,7 @@ if (WINDOWS) | |||
1060 | res/arrowdrag.cur | 1060 | res/arrowdrag.cur |
1061 | res/circleandline.cur | 1061 | res/circleandline.cur |
1062 | res/imp_icon.ico | 1062 | res/imp_icon.ico |
1063 | res/imprudence_icon.png | 1063 | res/meta-impy_icon.png |
1064 | res/llarrow.cur | 1064 | res/llarrow.cur |
1065 | res/llarrowdrag.cur | 1065 | res/llarrowdrag.cur |
1066 | res/llarrowdragmulti.cur | 1066 | res/llarrowdragmulti.cur |
@@ -1421,13 +1421,13 @@ set(ARTWORK_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH | |||
1421 | 1421 | ||
1422 | if (LINUX) | 1422 | if (LINUX) |
1423 | add_custom_command( | 1423 | add_custom_command( |
1424 | OUTPUT imprudence-stripped | 1424 | OUTPUT meta-impy-stripped |
1425 | COMMAND strip | 1425 | COMMAND strip |
1426 | ARGS --strip-debug -o imprudence-stripped ${VIEWER_BINARY_NAME} | 1426 | ARGS --strip-debug -o meta-impy-stripped ${VIEWER_BINARY_NAME} |
1427 | DEPENDS imprudence-bin | 1427 | DEPENDS meta-impy-bin |
1428 | ) | 1428 | ) |
1429 | 1429 | ||
1430 | set(product Imprudence-${ARCH}-${viewer_VERSION}) | 1430 | set(product meta-impy-${ARCH}-${viewer_VERSION}) |
1431 | 1431 | ||
1432 | add_custom_command( | 1432 | add_custom_command( |
1433 | OUTPUT ${product}.tar.bz2 | 1433 | OUTPUT ${product}.tar.bz2 |
@@ -1446,7 +1446,7 @@ if (LINUX) | |||
1446 | --build=${CMAKE_CURRENT_BINARY_DIR} | 1446 | --build=${CMAKE_CURRENT_BINARY_DIR} |
1447 | --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged | 1447 | --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged |
1448 | --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched | 1448 | --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched |
1449 | DEPENDS imprudence-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py | 1449 | DEPENDS meta-impy-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py |
1450 | ) | 1450 | ) |
1451 | 1451 | ||
1452 | add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit) | 1452 | add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_gstreamer010 media_plugin_webkit) |
@@ -1458,16 +1458,16 @@ if (LINUX) | |||
1458 | endif (LINUX) | 1458 | endif (LINUX) |
1459 | 1459 | ||
1460 | if (DARWIN) | 1460 | if (DARWIN) |
1461 | set(product "Imprudence") | 1461 | set(product "meta-impy") |
1462 | set_target_properties( | 1462 | set_target_properties( |
1463 | ${VIEWER_BINARY_NAME} | 1463 | ${VIEWER_BINARY_NAME} |
1464 | PROPERTIES | 1464 | PROPERTIES |
1465 | OUTPUT_NAME "${product}" | 1465 | OUTPUT_NAME "${product}" |
1466 | MACOSX_BUNDLE_INFO_STRING "info string - localize me" | 1466 | MACOSX_BUNDLE_INFO_STRING "info string - localize me" |
1467 | MACOSX_BUNDLE_ICON_FILE "viewer.icns" | 1467 | MACOSX_BUNDLE_ICON_FILE "viewer.icns" |
1468 | MACOSX_BUNDLE_GUI_IDENTIFIER "Imprudence" | 1468 | MACOSX_BUNDLE_GUI_IDENTIFIER "meta-impy" |
1469 | MACOSX_BUNDLE_LONG_VERSION_STRING "ververver" | 1469 | MACOSX_BUNDLE_LONG_VERSION_STRING "ververver" |
1470 | MACOSX_BUNDLE_BUNDLE_NAME "Imprudence" | 1470 | MACOSX_BUNDLE_BUNDLE_NAME "meta-impy" |
1471 | MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf" | 1471 | MACOSX_BUNDLE_SHORT_VERSION_STRING "asdf" |
1472 | MACOSX_BUNDLE_BUNDLE_VERSION "asdf" | 1472 | MACOSX_BUNDLE_BUNDLE_VERSION "asdf" |
1473 | MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer" | 1473 | MACOSX_BUNDLE_COPYRIGHT "copyright linden lab 2007 - localize me and run me through a legal wringer" |
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings index 8f9c4f5..17a0b7c 100644 --- a/linden/indra/newview/English.lproj/InfoPlist.strings +++ b/linden/indra/newview/English.lproj/InfoPlist.strings | |||
@@ -1,5 +1,5 @@ | |||
1 | /* Localized versions of Info.plist keys */ | 1 | /* Localized versions of Info.plist keys */ |
2 | 2 | ||
3 | CFBundleName = "Imprudence"; | 3 | CFBundleName = "meta-impy"; |
4 | CFBundleShortVersionString = "Imprudence Experimental 2010.09.04"; | 4 | CFBundleShortVersionString = "meta-impy Experimental 2010.09.04"; |
5 | CFBundleGetInfoString = "Imprudence Experimental 2010.09.04"; | 5 | CFBundleGetInfoString = "meta-impy Experimental 2010.09.04"; |
diff --git a/linden/indra/newview/Info-Imprudence.plist b/linden/indra/newview/Info-meta-impy.plist index e7dc82d..c5b413e 100644 --- a/linden/indra/newview/Info-Imprudence.plist +++ b/linden/indra/newview/Info-meta-impy.plist | |||
@@ -5,7 +5,7 @@ | |||
5 | <key>CFBundleDevelopmentRegion</key> | 5 | <key>CFBundleDevelopmentRegion</key> |
6 | <string>English</string> | 6 | <string>English</string> |
7 | <key>CFBundleExecutable</key> | 7 | <key>CFBundleExecutable</key> |
8 | <string>Imprudence</string> | 8 | <string>meta-impy</string> |
9 | <key>CFBundleIconFile</key> | 9 | <key>CFBundleIconFile</key> |
10 | <string>viewer.icns</string> | 10 | <string>viewer.icns</string> |
11 | <key>CFBundleIdentifier</key> | 11 | <key>CFBundleIdentifier</key> |
@@ -13,7 +13,7 @@ | |||
13 | <key>CFBundleInfoDictionaryVersion</key> | 13 | <key>CFBundleInfoDictionaryVersion</key> |
14 | <string>6.0</string> | 14 | <string>6.0</string> |
15 | <key>CFBundleName</key> | 15 | <key>CFBundleName</key> |
16 | <string>Imprudence</string> | 16 | <string>meta-impy</string> |
17 | <key>CFBundlePackageType</key> | 17 | <key>CFBundlePackageType</key> |
18 | <string>APPL</string> | 18 | <string>APPL</string> |
19 | <key>CFBundleSignature</key> | 19 | <key>CFBundleSignature</key> |
diff --git a/linden/indra/newview/SecondLife.nib/objects.xib b/linden/indra/newview/SecondLife.nib/objects.xib index 553b6f3..7ef13e0 100644 --- a/linden/indra/newview/SecondLife.nib/objects.xib +++ b/linden/indra/newview/SecondLife.nib/objects.xib | |||
@@ -6,17 +6,17 @@ | |||
6 | </object> | 6 | </object> |
7 | <array count="31" name="allObjects"> | 7 | <array count="31" name="allObjects"> |
8 | <object class="IBCarbonMenu" id="29"> | 8 | <object class="IBCarbonMenu" id="29"> |
9 | <string name="title">Imprudence</string> | 9 | <string name="title">meta-impy</string> |
10 | <array count="4" name="items"> | 10 | <array count="4" name="items"> |
11 | <object class="IBCarbonMenuItem" id="182"> | 11 | <object class="IBCarbonMenuItem" id="182"> |
12 | <string name="title">Imprudence</string> | 12 | <string name="title">meta-impy</string> |
13 | <object name="submenu" class="IBCarbonMenu" id="181"> | 13 | <object name="submenu" class="IBCarbonMenu" id="181"> |
14 | <string name="title">Imprudence</string> | 14 | <string name="title">meta-impy</string> |
15 | <array count="1" name="items"> | 15 | <array count="1" name="items"> |
16 | <object class="IBCarbonMenuItem" id="183"> | 16 | <object class="IBCarbonMenuItem" id="183"> |
17 | <boolean name="disabled">TRUE</boolean> | 17 | <boolean name="disabled">TRUE</boolean> |
18 | <boolean name="updateSingleItem">TRUE</boolean> | 18 | <boolean name="updateSingleItem">TRUE</boolean> |
19 | <string name="title">About Imprudence</string> | 19 | <string name="title">About meta-impy</string> |
20 | <int name="keyEquivalentModifier">0</int> | 20 | <int name="keyEquivalentModifier">0</int> |
21 | <ostype name="command">abou</ostype> | 21 | <ostype name="command">abou</ostype> |
22 | </object> | 22 | </object> |
diff --git a/linden/indra/newview/ViewerInstall.cmake b/linden/indra/newview/ViewerInstall.cmake index bc839c4..0959280 100644 --- a/linden/indra/newview/ViewerInstall.cmake +++ b/linden/indra/newview/ViewerInstall.cmake | |||
@@ -1,4 +1,4 @@ | |||
1 | install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/imprudence-bin | 1 | install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/meta-impy-bin |
2 | DESTINATION ${APP_BINARY_DIR} | 2 | DESTINATION ${APP_BINARY_DIR} |
3 | ) | 3 | ) |
4 | 4 | ||
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 1d3a44f..67df287 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -13422,7 +13422,7 @@ | |||
13422 | <key>Type</key> | 13422 | <key>Type</key> |
13423 | <string>String</string> | 13423 | <string>String</string> |
13424 | <key>Value</key> | 13424 | <key>Value</key> |
13425 | <string>Imprudence</string> | 13425 | <string>meta-impy</string> |
13426 | </map> | 13426 | </map> |
13427 | <key>VertexShaderEnable</key> | 13427 | <key>VertexShaderEnable</key> |
13428 | <map> | 13428 | <map> |
diff --git a/linden/indra/newview/installers/windows/installer_template.nsi b/linden/indra/newview/installers/windows/installer_template.nsi index 8afde89..ee79954 100644 --- a/linden/indra/newview/installers/windows/installer_template.nsi +++ b/linden/indra/newview/installers/windows/installer_template.nsi | |||
@@ -287,7 +287,7 @@ FunctionEnd | |||
287 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 287 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
288 | Function CloseSecondLife | 288 | Function CloseSecondLife |
289 | Push $0 | 289 | Push $0 |
290 | FindWindow $0 "Imprudence" "" | 290 | FindWindow $0 "meta-impy" "" |
291 | IntCmp $0 0 DONE | 291 | IntCmp $0 0 DONE |
292 | MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL | 292 | MessageBox MB_OKCANCEL $(CloseSecondLifeInstMB) IDOK CLOSE IDCANCEL CANCEL_INSTALL |
293 | 293 | ||
@@ -299,7 +299,7 @@ Function CloseSecondLife | |||
299 | SendMessage $0 16 0 0 | 299 | SendMessage $0 16 0 0 |
300 | 300 | ||
301 | LOOP: | 301 | LOOP: |
302 | FindWindow $0 "Imprudence" "" | 302 | FindWindow $0 "meta-impy" "" |
303 | IntCmp $0 0 DONE | 303 | IntCmp $0 0 DONE |
304 | Sleep 500 | 304 | Sleep 500 |
305 | Goto LOOP | 305 | Goto LOOP |
@@ -344,12 +344,12 @@ FunctionEnd | |||
344 | ; FunctionEnd | 344 | ; FunctionEnd |
345 | 345 | ||
346 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 346 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
347 | ; Delete files in Documents and Settings\<user>\Imprudence\cache | 347 | ; Delete files in Documents and Settings\<user>\meta-impy\cache |
348 | ; Delete files in Documents and Settings\All Users\Imprudence\cache | 348 | ; Delete files in Documents and Settings\All Users\meta-impy\cache |
349 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 349 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
350 | ;Function RemoveCacheFiles | 350 | ;Function RemoveCacheFiles |
351 | ; | 351 | ; |
352 | ;; Delete files in Documents and Settings\<user>\Imprudence | 352 | ;; Delete files in Documents and Settings\<user>\meta-impy |
353 | ;Push $0 | 353 | ;Push $0 |
354 | ;Push $1 | 354 | ;Push $1 |
355 | ;Push $2 | 355 | ;Push $2 |
@@ -368,7 +368,7 @@ FunctionEnd | |||
368 | ; ExpandEnvStrings $2 $2 | 368 | ; ExpandEnvStrings $2 $2 |
369 | ; | 369 | ; |
370 | ; ; When explicitly uninstalling, everything goes away | 370 | ; ; When explicitly uninstalling, everything goes away |
371 | ; RMDir /r "$2\Application Data\Imprudence\cache" | 371 | ; RMDir /r "$2\Application Data\meta-impy\cache" |
372 | ; | 372 | ; |
373 | ; CONTINUE: | 373 | ; CONTINUE: |
374 | ; IntOp $0 $0 + 1 | 374 | ; IntOp $0 $0 + 1 |
@@ -378,17 +378,17 @@ FunctionEnd | |||
378 | ;Pop $1 | 378 | ;Pop $1 |
379 | ;Pop $0 | 379 | ;Pop $0 |
380 | ; | 380 | ; |
381 | ;; Delete files in Documents and Settings\All Users\Imprudence | 381 | ;; Delete files in Documents and Settings\All Users\meta-impy |
382 | ;Push $0 | 382 | ;Push $0 |
383 | ; ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData" | 383 | ; ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData" |
384 | ; StrCmp $0 "" +2 | 384 | ; StrCmp $0 "" +2 |
385 | ; RMDir /r "$0\Imprudence\cache" | 385 | ; RMDir /r "$0\meta-impy\cache" |
386 | ;Pop $0 | 386 | ;Pop $0 |
387 | ; | 387 | ; |
388 | ;; Delete filse in C:\Windows\Application Data\Imprudence | 388 | ;; Delete filse in C:\Windows\Application Data\meta-impy |
389 | ;; If the user is running on a pre-NT system, Application Data lives here instead of | 389 | ;; If the user is running on a pre-NT system, Application Data lives here instead of |
390 | ;; in Documents and Settings. | 390 | ;; in Documents and Settings. |
391 | ;RMDir /r "$WINDIR\Application Data\Imprudence\cache" | 391 | ;RMDir /r "$WINDIR\Application Data\meta-impy\cache" |
392 | ; | 392 | ; |
393 | ;FunctionEnd | 393 | ;FunctionEnd |
394 | 394 | ||
@@ -438,12 +438,12 @@ FunctionEnd | |||
438 | 438 | ||
439 | 439 | ||
440 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 440 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
441 | ; Delete files in Documents and Settings\<user>\Imprudence | 441 | ; Delete files in Documents and Settings\<user>\meta-impy |
442 | ; Delete files in Documents and Settings\All Users\Imprudence | 442 | ; Delete files in Documents and Settings\All Users\meta-impy |
443 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 443 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
444 | Function un.DocumentsAndSettingsFolder | 444 | Function un.DocumentsAndSettingsFolder |
445 | 445 | ||
446 | ; Delete files in Documents and Settings\<user>\Imprudence | 446 | ; Delete files in Documents and Settings\<user>\meta-impy |
447 | Push $0 | 447 | Push $0 |
448 | Push $1 | 448 | Push $1 |
449 | Push $2 | 449 | Push $2 |
@@ -466,13 +466,13 @@ Push $2 | |||
466 | ; Otherwise (preview/dmz etc) just remove cache | 466 | ; Otherwise (preview/dmz etc) just remove cache |
467 | StrCmp $INSTFLAGS "" RM_ALL RM_CACHE | 467 | StrCmp $INSTFLAGS "" RM_ALL RM_CACHE |
468 | RM_ALL: | 468 | RM_ALL: |
469 | RMDir /r "$2\Application Data\Imprudence" | 469 | RMDir /r "$2\Application Data\meta-impy" |
470 | RM_CACHE: | 470 | RM_CACHE: |
471 | # Local Settings directory is the cache, there is no "cache" subdir | 471 | # Local Settings directory is the cache, there is no "cache" subdir |
472 | RMDir /r "$2\Local Settings\Application Data\Imprudence" | 472 | RMDir /r "$2\Local Settings\Application Data\meta-impy" |
473 | # Vista version of the same | 473 | # Vista version of the same |
474 | RMDir /r "$2\AppData\Local\Imprudence" | 474 | RMDir /r "$2\AppData\Local\meta-impy" |
475 | Delete "$2\Application Data\Imprudence\user_settings\settings_windlight.xml" | 475 | Delete "$2\Application Data\meta-impy\user_settings\settings_windlight.xml" |
476 | 476 | ||
477 | CONTINUE: | 477 | CONTINUE: |
478 | IntOp $0 $0 + 1 | 478 | IntOp $0 $0 + 1 |
@@ -483,17 +483,17 @@ Pop $2 | |||
483 | Pop $1 | 483 | Pop $1 |
484 | Pop $0 | 484 | Pop $0 |
485 | 485 | ||
486 | ; Delete files in Documents and Settings\All Users\Imprudence | 486 | ; Delete files in Documents and Settings\All Users\meta-impy |
487 | Push $0 | 487 | Push $0 |
488 | ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData" | 488 | ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData" |
489 | StrCmp $0 "" +2 | 489 | StrCmp $0 "" +2 |
490 | RMDir /r "$0\Imprudence" | 490 | RMDir /r "$0\meta-impy" |
491 | Pop $0 | 491 | Pop $0 |
492 | 492 | ||
493 | ; Delete filse in C:\Windows\Application Data\Imprudence | 493 | ; Delete filse in C:\Windows\Application Data\meta-impy |
494 | ; If the user is running on a pre-NT system, Application Data lives here instead of | 494 | ; If the user is running on a pre-NT system, Application Data lives here instead of |
495 | ; in Documents and Settings. | 495 | ; in Documents and Settings. |
496 | RMDir /r "$WINDIR\Application Data\Imprudence" | 496 | RMDir /r "$WINDIR\Application Data\meta-impy" |
497 | 497 | ||
498 | FunctionEnd | 498 | FunctionEnd |
499 | 499 | ||
@@ -503,7 +503,7 @@ FunctionEnd | |||
503 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 503 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
504 | Function un.CloseSecondLife | 504 | Function un.CloseSecondLife |
505 | Push $0 | 505 | Push $0 |
506 | FindWindow $0 "Imprudence" "" | 506 | FindWindow $0 "meta-impy" "" |
507 | IntCmp $0 0 DONE | 507 | IntCmp $0 0 DONE |
508 | MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL | 508 | MessageBox MB_OKCANCEL $(CloseSecondLifeUnInstMB) IDOK CLOSE IDCANCEL CANCEL_UNINSTALL |
509 | 509 | ||
@@ -515,7 +515,7 @@ Function un.CloseSecondLife | |||
515 | SendMessage $0 16 0 0 | 515 | SendMessage $0 16 0 0 |
516 | 516 | ||
517 | LOOP: | 517 | LOOP: |
518 | FindWindow $0 "Imprudence" "" | 518 | FindWindow $0 "meta-impy" "" |
519 | IntCmp $0 0 DONE | 519 | IntCmp $0 0 DONE |
520 | Sleep 500 | 520 | Sleep 500 |
521 | Goto LOOP | 521 | Goto LOOP |
@@ -536,7 +536,7 @@ Function un.RemovePassword | |||
536 | DetailPrint "Removing Second Life password" | 536 | DetailPrint "Removing Second Life password" |
537 | 537 | ||
538 | SetShellVarContext current | 538 | SetShellVarContext current |
539 | Delete "$APPDATA\Imprudence\user_settings\password.dat" | 539 | Delete "$APPDATA\meta-impy\user_settings\password.dat" |
540 | SetShellVarContext all | 540 | SetShellVarContext all |
541 | 541 | ||
542 | FunctionEnd | 542 | FunctionEnd |
@@ -758,11 +758,11 @@ SectionEnd ; end of uninstall section | |||
758 | !macroend | 758 | !macroend |
759 | 759 | ||
760 | Function GetProgramName | 760 | Function GetProgramName |
761 | !insertmacro GetParameterValue "/P=" "Imprudence" | 761 | !insertmacro GetParameterValue "/P=" "meta-impy" |
762 | FunctionEnd | 762 | FunctionEnd |
763 | 763 | ||
764 | Function un.GetProgramName | 764 | Function un.GetProgramName |
765 | !insertmacro GetParameterValue "/P=" "Imprudence" | 765 | !insertmacro GetParameterValue "/P=" "meta-impy" |
766 | FunctionEnd | 766 | FunctionEnd |
767 | 767 | ||
768 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 768 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
diff --git a/linden/indra/newview/installers/windows/lang_de.nsi b/linden/indra/newview/installers/windows/lang_de.nsi index e45b3b1..5e21cb3 100644 --- a/linden/indra/newview/installers/windows/lang_de.nsi +++ b/linden/indra/newview/installers/windows/lang_de.nsi | |||
@@ -6,52 +6,52 @@ LangString LicenseSubTitleUpdate ${LANG_GERMAN} " Update" | |||
6 | LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup" | 6 | LangString LicenseSubTitleSetup ${LANG_GERMAN} " Setup" |
7 | 7 | ||
8 | ; description on license page | 8 | ; description on license page |
9 | LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte Imprudence mit Version ${VERSION_LONG}. ersetzen." | 9 | LangString LicenseDescUpdate ${LANG_GERMAN} "Dieses Paket wird das bereits installierte meta-impy mit Version ${VERSION_LONG}. ersetzen." |
10 | LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird Imprudence auf Ihrem Computer installieren." | 10 | LangString LicenseDescSetup ${LANG_GERMAN} "Dieses Paket wird meta-impy auf Ihrem Computer installieren." |
11 | LangString LicenseDescNext ${LANG_GERMAN} "Weiter" | 11 | LangString LicenseDescNext ${LANG_GERMAN} "Weiter" |
12 | 12 | ||
13 | ; installation directory text | 13 | ; installation directory text |
14 | LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner" | 14 | LangString DirectoryChooseTitle ${LANG_GERMAN} "Installations-Ordner" |
15 | LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den Imprudence Ordner für dieses Update:" | 15 | LangString DirectoryChooseUpdate ${LANG_GERMAN} "Wählen Sie den meta-impy Ordner für dieses Update:" |
16 | LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem Imprudence installieren werden soll:" | 16 | LangString DirectoryChooseSetup ${LANG_GERMAN} "Pfad in dem meta-impy installieren werden soll:" |
17 | 17 | ||
18 | ; CheckStartupParams message box | 18 | ; CheckStartupParams message box |
19 | LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen." | 19 | LangString CheckStartupParamsMB ${LANG_GERMAN} "Konnte Programm '$INSTPROG' nicht finden. Stilles Update fehlgeschlagen." |
20 | 20 | ||
21 | ; installation success dialog | 21 | ; installation success dialog |
22 | LangString InstSuccesssQuestion ${LANG_GERMAN} "Imprudence starten?" | 22 | LangString InstSuccesssQuestion ${LANG_GERMAN} "meta-impy starten?" |
23 | 23 | ||
24 | ; remove old NSIS version | 24 | ; remove old NSIS version |
25 | LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..." | 25 | LangString RemoveOldNSISVersion ${LANG_GERMAN} "Überprüfe alte Version ..." |
26 | 26 | ||
27 | ; check windows version | 27 | ; check windows version |
28 | LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..." | 28 | LangString CheckWindowsVersionDP ${LANG_GERMAN} "Überprüfung der Windows Version ..." |
29 | LangString CheckWindowsVersionMB ${LANG_GERMAN} 'Imprudence unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?' | 29 | LangString CheckWindowsVersionMB ${LANG_GERMAN} 'meta-impy unterstützt nur Windows XP, Windows 2000 und Mac OS X.$\n$\nDer Versuch es auf Windows $R0 zu installieren, könnte zu unvorhersehbaren Abstürzen und Datenverlust führen.$\n$\nTrotzdem installieren?' |
30 | 30 | ||
31 | ; checkifadministrator function (install) | 31 | ; checkifadministrator function (install) |
32 | LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..." | 32 | LangString CheckAdministratorInstDP ${LANG_GERMAN} "Überprüfung der Installations-Berechtigungen ..." |
33 | LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence installieren zu können.' | 33 | LangString CheckAdministratorInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um meta-impy installieren zu können.' |
34 | 34 | ||
35 | ; checkifadministrator function (uninstall) | 35 | ; checkifadministrator function (uninstall) |
36 | LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..." | 36 | LangString CheckAdministratorUnInstDP ${LANG_GERMAN} "Überprüfung der Entfernungs-Berechtigungen ..." |
37 | LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um Imprudence entfernen zu können..' | 37 | LangString CheckAdministratorUnInstMB ${LANG_GERMAN} 'Sie besitzen ungenügende Berechtigungen.$\nSie müssen ein "administrator" sein, um meta-impy entfernen zu können..' |
38 | 38 | ||
39 | ; checkifalreadycurrent | 39 | ; checkifalreadycurrent |
40 | LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist Imprudence ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?" | 40 | LangString CheckIfCurrentMB ${LANG_GERMAN} "Anscheinend ist meta-impy ${VERSION_LONG} bereits installiert.$\n$\nWürden Sie es gerne erneut installieren?" |
41 | 41 | ||
42 | ; closeimprudence function (install) | 42 | ; closeimprudence function (install) |
43 | LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..." | 43 | LangString CloseSecondLifeInstDP ${LANG_GERMAN} "Warten auf die Beendigung von meta-impy ..." |
44 | LangString CloseSecondLifeInstMB ${LANG_GERMAN} "Imprudence kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." | 44 | LangString CloseSecondLifeInstMB ${LANG_GERMAN} "meta-impy kann nicht installiert oder ersetzt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um meta-impy zu beenden.$\nKlicken Sie CANCEL, um die Installation abzubrechen." |
45 | 45 | ||
46 | ; closeimprudence function (uninstall) | 46 | ; closeimprudence function (uninstall) |
47 | LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von Imprudence ..." | 47 | LangString CloseSecondLifeUnInstDP ${LANG_GERMAN} "Warten auf die Beendigung von meta-impy ..." |
48 | LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "Imprudence kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um Imprudence zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." | 48 | LangString CloseSecondLifeUnInstMB ${LANG_GERMAN} "meta-impy kann nicht entfernt werden, wenn es bereits läuft.$\n$\nBeenden Sie, was Sie gerade tun und klicken Sie OK, um meta-impy zu beenden.$\nKlicken Sie CANCEL, um abzubrechen." |
49 | 49 | ||
50 | ; removecachefiles | 50 | ; removecachefiles |
51 | LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen." | 51 | LangString RemoveCacheFilesDP ${LANG_GERMAN} "Löschung aller Cache Dateien in Dokumente und Einstellungen." |
52 | 52 | ||
53 | ; delete program files | 53 | ; delete program files |
54 | LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem Imprudence Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?" | 54 | LangString DeleteProgramFilesMB ${LANG_GERMAN} "Es existieren weiterhin Dateien in Ihrem meta-impy Programm Ordner.$\n$\nDies sind möglicherweise Dateien, die sie modifiziert oder bewegt haben:$\n$INSTDIR$\n$\nMöchten Sie diese ebenfalls löschen?" |
55 | 55 | ||
56 | ; uninstall text | 56 | ; uninstall text |
57 | LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird Imprudence ${VERSION_LONG} von Ihrem System entfernen." | 57 | LangString UninstallTextMsg ${LANG_GERMAN} "Dies wird meta-impy ${VERSION_LONG} von Ihrem System entfernen." |
diff --git a/linden/indra/newview/installers/windows/lang_en-us.nsi b/linden/indra/newview/installers/windows/lang_en-us.nsi index 0d28c3f..5612418 100644 --- a/linden/indra/newview/installers/windows/lang_en-us.nsi +++ b/linden/indra/newview/installers/windows/lang_en-us.nsi | |||
@@ -7,46 +7,46 @@ LangString LicenseSubTitleSetup ${LANG_ENGLISH} " Setup" | |||
7 | 7 | ||
8 | ; installation directory text | 8 | ; installation directory text |
9 | LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" | 9 | LangString DirectoryChooseTitle ${LANG_ENGLISH} "Installation Directory" |
10 | LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the Imprudence directory to update to version ${VERSION_LONG}.(XXX):" | 10 | LangString DirectoryChooseUpdate ${LANG_ENGLISH} "Select the meta-impy directory to update to version ${VERSION_LONG}.(XXX):" |
11 | LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install Imprudence in:" | 11 | LangString DirectoryChooseSetup ${LANG_ENGLISH} "Select the directory to install meta-impy in:" |
12 | 12 | ||
13 | ; CheckStartupParams message box | 13 | ; CheckStartupParams message box |
14 | LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed." | 14 | LangString CheckStartupParamsMB ${LANG_ENGLISH} "Could not find the program '$INSTPROG'. Silent update failed." |
15 | 15 | ||
16 | ; installation success dialog | 16 | ; installation success dialog |
17 | LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start Imprudence now?" | 17 | LangString InstSuccesssQuestion ${LANG_ENGLISH} "Start meta-impy now?" |
18 | 18 | ||
19 | ; remove old NSIS version | 19 | ; remove old NSIS version |
20 | LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..." | 20 | LangString RemoveOldNSISVersion ${LANG_ENGLISH} "Checking for old version..." |
21 | 21 | ||
22 | ; check windows version | 22 | ; check windows version |
23 | LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..." | 23 | LangString CheckWindowsVersionDP ${LANG_ENGLISH} "Checking Windows version..." |
24 | LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'Imprudence only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?' | 24 | LangString CheckWindowsVersionMB ${LANG_ENGLISH} 'meta-impy only supports Windows XP, Windows 2000, and Mac OS X.$\n$\nAttempting to install on Windows $R0 can result in crashes and data loss.$\n$\nInstall anyway?' |
25 | 25 | ||
26 | ; checkifadministrator function (install) | 26 | ; checkifadministrator function (install) |
27 | LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..." | 27 | LangString CheckAdministratorInstDP ${LANG_ENGLISH} "Checking for permission to install..." |
28 | LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install Imprudence.' | 28 | LangString CheckAdministratorInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to install meta-impy.' |
29 | 29 | ||
30 | ; checkifadministrator function (uninstall) | 30 | ; checkifadministrator function (uninstall) |
31 | LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..." | 31 | LangString CheckAdministratorUnInstDP ${LANG_ENGLISH} "Checking for permission to uninstall..." |
32 | LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall Imprudence.' | 32 | LangString CheckAdministratorUnInstMB ${LANG_ENGLISH} 'You appear to be using a "limited" account.$\nYou must be an "administrator" to uninstall meta-impy.' |
33 | 33 | ||
34 | ; checkifalreadycurrent | 34 | ; checkifalreadycurrent |
35 | LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that Imprudence ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?" | 35 | LangString CheckIfCurrentMB ${LANG_ENGLISH} "It appears that meta-impy ${VERSION_LONG} is already installed.$\n$\nWould you like to install it again?" |
36 | 36 | ||
37 | ; closeimprudence function (install) | 37 | ; closeimprudence function (install) |
38 | LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..." | 38 | LangString CloseSecondLifeInstDP ${LANG_ENGLISH} "Waiting for meta-impy to shut down..." |
39 | LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "Imprudence can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel installation." | 39 | LangString CloseSecondLifeInstMB ${LANG_ENGLISH} "meta-impy can't be installed while it is already running.$\n$\nFinish what you're doing then select OK to close meta-impy and continue.$\nSelect CANCEL to cancel installation." |
40 | 40 | ||
41 | ; closeimprudence function (uninstall) | 41 | ; closeimprudence function (uninstall) |
42 | LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for Imprudence to shut down..." | 42 | LangString CloseSecondLifeUnInstDP ${LANG_ENGLISH} "Waiting for meta-impy to shut down..." |
43 | LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "Imprudence can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close Imprudence and continue.$\nSelect CANCEL to cancel." | 43 | LangString CloseSecondLifeUnInstMB ${LANG_ENGLISH} "meta-impy can't be uninstalled while it is already running.$\n$\nFinish what you're doing then select OK to close meta-impy and continue.$\nSelect CANCEL to cancel." |
44 | 44 | ||
45 | ; removecachefiles | 45 | ; removecachefiles |
46 | LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder" | 46 | LangString RemoveCacheFilesDP ${LANG_ENGLISH} "Deleting cache files in Documents and Settings folder" |
47 | 47 | ||
48 | ; delete program files | 48 | ; delete program files |
49 | LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your Imprudence program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?" | 49 | LangString DeleteProgramFilesMB ${LANG_ENGLISH} "There are still files in your meta-impy program directory.$\n$\nThese are possibly files you created or moved to:$\n$INSTDIR$\n$\nDo you want to remove them?" |
50 | 50 | ||
51 | ; uninstall text | 51 | ; uninstall text |
52 | LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall Imprudence ${VERSION_LONG} from your system." | 52 | LangString UninstallTextMsg ${LANG_ENGLISH} "This will uninstall meta-impy ${VERSION_LONG} from your system." |
diff --git a/linden/indra/newview/installers/windows/imprudence installer script experimental.iss b/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss index d62e210..9480859 100644 --- a/linden/indra/newview/installers/windows/imprudence installer script experimental.iss +++ b/linden/indra/newview/installers/windows/meta-impy installer script experimental.iss | |||
@@ -8,12 +8,12 @@ | |||
8 | 8 | ||
9 | ; These will change | 9 | ; These will change |
10 | AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} | 10 | AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460} |
11 | AppName=Imprudence Viewer Experimental Release | 11 | AppName=meta-impy Viewer Experimental Release |
12 | AppVerName=Imprudence Viewer 1.4.0 Experimental 2010.09.04 | 12 | AppVerName=meta-impy Viewer 1.4.0 Experimental 2010.09.04 |
13 | DefaultDirName={pf}\ImprudenceExperimental | 13 | DefaultDirName={pf}\meta-impyExperimental |
14 | DefaultGroupName=Imprudence Viewer Experimental Release | 14 | DefaultGroupName=meta-impy Viewer Experimental Release |
15 | VersionInfoProductName=Imprudence Viewer Experimental Release | 15 | VersionInfoProductName=meta-impy Viewer Experimental Release |
16 | OutputBaseFilename=Imprudence-1.4.0-experimental-2010.09.04-Setup | 16 | OutputBaseFilename=meta-impy-1.4.0-experimental-2010.09.04-Setup |
17 | VersionInfoVersion=1.4.0 | 17 | VersionInfoVersion=1.4.0 |
18 | VersionInfoTextVersion=1.4.0 | 18 | VersionInfoTextVersion=1.4.0 |
19 | VersionInfoProductVersion=1.4.0 | 19 | VersionInfoProductVersion=1.4.0 |
@@ -21,7 +21,7 @@ VersionInfoCopyright=2010 | |||
21 | AppCopyright=2010 | 21 | AppCopyright=2010 |
22 | 22 | ||
23 | ; These won't change | 23 | ; These won't change |
24 | VersionInfoCompany=Imprudence | 24 | VersionInfoCompany=meta-impy |
25 | AppPublisher=The Imprudence Project | 25 | AppPublisher=The Imprudence Project |
26 | AppPublisherURL=http://www.imprudenceviewer.org | 26 | AppPublisherURL=http://www.imprudenceviewer.org |
27 | AppSupportURL=http://www.imprudenceviewer.org | 27 | AppSupportURL=http://www.imprudenceviewer.org |
@@ -35,8 +35,8 @@ InternalCompressLevel=ultra64 | |||
35 | SolidCompression=true | 35 | SolidCompression=true |
36 | PrivilegesRequired=poweruser | 36 | PrivilegesRequired=poweruser |
37 | AllowRootDirectory=true | 37 | AllowRootDirectory=true |
38 | WizardImageFile=..\windows\imprudence_installer_icon_left.bmp | 38 | WizardImageFile=..\windows\meta-impy_installer_icon_left.bmp |
39 | WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp | 39 | WizardSmallImageFile=..\windows\meta-impy_installer_icon_right.bmp |
40 | SetupLogging=true | 40 | SetupLogging=true |
41 | 41 | ||
42 | [Languages] | 42 | [Languages] |
@@ -45,12 +45,12 @@ Name: english; MessagesFile: compiler:Default.isl | |||
45 | [Tasks] | 45 | [Tasks] |
46 | Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce | 46 | Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce |
47 | Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce | 47 | Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce |
48 | Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce | 48 | Name: slurlassociate; Description: Associate meta-impy with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce |
49 | ; TODO: use scripting for something like this on uninstall: | 49 | ; TODO: use scripting for something like this on uninstall: |
50 | ; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: | 50 | ; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: |
51 | 51 | ||
52 | [Files] | 52 | [Files] |
53 | Source: C:\imp_1.3\imprudence.exe; DestDir: {app}; Flags: ignoreversion | 53 | Source: C:\imp_1.3\meta-impy.exe; DestDir: {app}; Flags: ignoreversion |
54 | Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs | 54 | Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs |
55 | Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs | 55 | Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs |
56 | Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs | 56 | Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs |
@@ -66,8 +66,8 @@ Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion | |||
66 | Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion | 66 | Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion |
67 | Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion | 67 | Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion |
68 | Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion | 68 | Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion |
69 | Source: C:\imp_1.3\imprudence.exe.config; DestDir: {app}; Flags: ignoreversion | 69 | Source: C:\imp_1.3\meta-impy.exe.config; DestDir: {app}; Flags: ignoreversion |
70 | Source: C:\imp_1.3\imprudence.url; DestDir: {app}; Flags: ignoreversion | 70 | Source: C:\imp_1.3\meta-impy.url; DestDir: {app}; Flags: ignoreversion |
71 | Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion | 71 | Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion |
72 | Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion | 72 | Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion |
73 | Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion | 73 | Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion |
@@ -155,31 +155,31 @@ Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion | |||
155 | [Registry] | 155 | [Registry] |
156 | Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life | 156 | Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life |
157 | Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol | 157 | Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol |
158 | Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\imprudence.exe | 158 | Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\meta-impy.exe |
159 | Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\imprudence.exe --settings settings_imprudence.xml -url ""%1"""; Languages: | 159 | Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\meta-impy.exe --settings settings_meta-impy.xml -url ""%1"""; Languages: |
160 | ; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib | 160 | ; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib |
161 | ; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} | 161 | ; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} |
162 | 162 | ||
163 | [Icons] | 163 | [Icons] |
164 | Name: {group}\{cm:UninstallProgram,Imprudence Experimental}; Filename: {uninstallexe} | 164 | Name: {group}\{cm:UninstallProgram,meta-impy Experimental}; Filename: {uninstallexe} |
165 | Name: {commondesktop}\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0 | 165 | Name: {commondesktop}\meta-impy Experimental; Filename: {app}\meta-impy.exe; Tasks: desktopicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app}; IconIndex: 0 |
166 | Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence Experimental; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app} | 166 | Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\meta-impy Experimental; Filename: {app}\meta-impy.exe; Tasks: quicklaunchicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app} |
167 | Name: {group}\Imprudence Experimental; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0; Parameters: --settings settings_imprudence.xml | 167 | Name: {group}\meta-impy Experimental; Filename: {app}\meta-impy.exe; WorkingDir: {app}; Comment: meta-impy; IconIndex: 0; Parameters: --settings settings_meta-impy.xml |
168 | 168 | ||
169 | [Run] | 169 | [Run] |
170 | Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall | 170 | Filename: {app}\meta-impy.exe; WorkingDir: {app}; Flags: nowait postinstall |
171 | Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different | 171 | Filename: {app}\meta-impy.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different |
172 | 172 | ||
173 | [UninstallDelete] | 173 | [UninstallDelete] |
174 | Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: | 174 | Name: {userappdata}\meta-impy\user_settings\password.dat; Type: files; Languages: |
175 | Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: | 175 | Name: {userappdata}\meta-impy\user_settings\settings.xml; Type: files; Languages: |
176 | Name: {userappdata}\Imprudence\user_settings\settings_imprudence.xml; Type: files; Languages: | 176 | Name: {userappdata}\meta-impy\user_settings\settings_meta-impy.xml; Type: files; Languages: |
177 | ; 1.2 and lower cache location: | 177 | ; 1.2 and lower cache location: |
178 | Name: {userappdata}\Imprudence\cache; Type: filesandordirs | 178 | Name: {userappdata}\meta-impy\cache; Type: filesandordirs |
179 | ; 1.3 and higher cache location: | 179 | ; 1.3 and higher cache location: |
180 | Name: {localappdata}\Imprudence\cache; Type: filesandordirs | 180 | Name: {localappdata}\meta-impy\cache; Type: filesandordirs |
181 | Name: {userappdata}\Imprudence\logs; Type: filesandordirs | 181 | Name: {userappdata}\meta-impy\logs; Type: filesandordirs |
182 | Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs | 182 | Name: {userappdata}\meta-impy\browser_profile; Type: filesandordirs |
183 | Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs | 183 | Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs |
184 | Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs | 184 | Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs |
185 | 185 | ||
diff --git a/linden/indra/newview/installers/windows/imprudence installer script.iss b/linden/indra/newview/installers/windows/meta-impy installer script.iss index 6ea24c6..d203f78 100644 --- a/linden/indra/newview/installers/windows/imprudence installer script.iss +++ b/linden/indra/newview/installers/windows/meta-impy installer script.iss | |||
@@ -8,12 +8,12 @@ | |||
8 | 8 | ||
9 | ; These will change | 9 | ; These will change |
10 | AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8} | 10 | AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8} |
11 | AppName=Imprudence | 11 | AppName=meta-impy |
12 | AppVerName=Imprudence Viewer 1.3.0 RC2 (SSE2 optimized) | 12 | AppVerName=meta-impy Viewer 1.3.0 RC2 (SSE2 optimized) |
13 | DefaultDirName={pf}\Imprudence | 13 | DefaultDirName={pf}\meta-impy |
14 | DefaultGroupName=Imprudence Viewer | 14 | DefaultGroupName=meta-impy Viewer |
15 | VersionInfoProductName=Imprudence Viewer | 15 | VersionInfoProductName=meta-impy Viewer |
16 | OutputBaseFilename=Imprudence-1.3.0-RC2-(SSE2-optimized)-Setup | 16 | OutputBaseFilename=meta-impy-1.3.0-RC2-(SSE2-optimized)-Setup |
17 | VersionInfoVersion=1.3.0 | 17 | VersionInfoVersion=1.3.0 |
18 | VersionInfoTextVersion=1.3.0 | 18 | VersionInfoTextVersion=1.3.0 |
19 | VersionInfoProductVersion=1.3.0 | 19 | VersionInfoProductVersion=1.3.0 |
@@ -21,7 +21,7 @@ VersionInfoCopyright=2010 | |||
21 | AppCopyright=2010 | 21 | AppCopyright=2010 |
22 | 22 | ||
23 | ; These won't change | 23 | ; These won't change |
24 | VersionInfoCompany=Imprudence | 24 | VersionInfoCompany=meta-impy |
25 | AppPublisher=The Imprudence Project | 25 | AppPublisher=The Imprudence Project |
26 | AppPublisherURL=http://www.imprudenceviewer.org | 26 | AppPublisherURL=http://www.imprudenceviewer.org |
27 | AppSupportURL=http://www.imprudenceviewer.org | 27 | AppSupportURL=http://www.imprudenceviewer.org |
@@ -35,8 +35,8 @@ InternalCompressLevel=ultra64 | |||
35 | SolidCompression=true | 35 | SolidCompression=true |
36 | PrivilegesRequired=poweruser | 36 | PrivilegesRequired=poweruser |
37 | AllowRootDirectory=true | 37 | AllowRootDirectory=true |
38 | WizardImageFile=..\windows\imprudence_installer_icon_left.bmp | 38 | WizardImageFile=..\windows\meta-impy_installer_icon_left.bmp |
39 | WizardSmallImageFile=..\windows\imprudence_installer_icon_right.bmp | 39 | WizardSmallImageFile=..\windows\meta-impy_installer_icon_right.bmp |
40 | SetupLogging=true | 40 | SetupLogging=true |
41 | 41 | ||
42 | [Languages] | 42 | [Languages] |
@@ -45,12 +45,12 @@ Name: english; MessagesFile: compiler:Default.isl | |||
45 | [Tasks] | 45 | [Tasks] |
46 | Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce | 46 | Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce |
47 | Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce | 47 | Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: checkedonce |
48 | Name: slurlassociate; Description: Associate Imprudence with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce | 48 | Name: slurlassociate; Description: Associate meta-impy with SLURLs; GroupDescription: Associations:; Languages: ; Flags: checkedonce |
49 | ; TODO: use scripting for something like this on uninstall: | 49 | ; TODO: use scripting for something like this on uninstall: |
50 | ; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: | 50 | ; Name: uninstallsettings; Description: Remove user settings; Flags: checkablealone; Languages: ; GroupDescription: Uninstall: |
51 | 51 | ||
52 | [Files] | 52 | [Files] |
53 | Source: C:\imp_1.3\imprudence.exe; DestDir: {app}; Flags: ignoreversion | 53 | Source: C:\imp_1.3\meta-impy.exe; DestDir: {app}; Flags: ignoreversion |
54 | Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs | 54 | Source: C:\imp_1.3\character\*; DestDir: {app}\character; Flags: ignoreversion recursesubdirs createallsubdirs |
55 | Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs | 55 | Source: C:\imp_1.3\fonts\*; DestDir: {app}\fonts; Flags: ignoreversion recursesubdirs createallsubdirs |
56 | Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs | 56 | Source: C:\imp_1.3\app_settings\*; DestDir: {app}\app_settings; Flags: ignoreversion recursesubdirs createallsubdirs |
@@ -66,8 +66,8 @@ Source: C:\imp_1.3\freebl3.dll; DestDir: {app}; Flags: ignoreversion | |||
66 | Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion | 66 | Source: C:\imp_1.3\glew32.dll; DestDir: {app}; Flags: ignoreversion |
67 | Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion | 67 | Source: C:\imp_1.3\gpu_table.txt; DestDir: {app}; Flags: ignoreversion |
68 | Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion | 68 | Source: C:\imp_1.3\iconv.dll; DestDir: {app}; Flags: ignoreversion |
69 | Source: C:\imp_1.3\imprudence.exe.config; DestDir: {app}; Flags: ignoreversion | 69 | Source: C:\imp_1.3\meta-impy.exe.config; DestDir: {app}; Flags: ignoreversion |
70 | Source: C:\imp_1.3\imprudence.url; DestDir: {app}; Flags: ignoreversion | 70 | Source: C:\imp_1.3\meta-impy.url; DestDir: {app}; Flags: ignoreversion |
71 | Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion | 71 | Source: C:\imp_1.3\intl.dll; DestDir: {app}; Flags: ignoreversion |
72 | Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion | 72 | Source: C:\imp_1.3\js3250.dll; DestDir: {app}; Flags: ignoreversion |
73 | Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion | 73 | Source: C:\imp_1.3\libcairo-2.dll; DestDir: {app}; Flags: ignoreversion |
@@ -154,31 +154,31 @@ Source: C:\imp_1.3\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion | |||
154 | [Registry] | 154 | [Registry] |
155 | Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life | 155 | Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: (default); ValueData: URL:Second Life |
156 | Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol | 156 | Root: HKCR; Subkey: secondlife; ValueType: string; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueName: URL Protocol |
157 | Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\imprudence.exe | 157 | Root: HKCR; Subkey: secondlife\DefaultIcon; Flags: uninsdeletekey deletekey; ValueType: string; Tasks: slurlassociate; ValueData: {app}\meta-impy.exe |
158 | Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\imprudence.exe --settings settings_imprudence.xml -url ""%1"""; Languages: | 158 | Root: HKCR; Subkey: secondlife\shell\open\command; ValueType: expandsz; Flags: uninsdeletekey deletekey; Tasks: slurlassociate; ValueData: "{app}\meta-impy.exe --settings settings_meta-impy.xml -url ""%1"""; Languages: |
159 | ; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib | 159 | ; Root: HKCU; Subkey: Environment; ValueType: string; ValueName: GST_PLUGIN_PATH; Flags: deletevalue uninsdeletevalue; ValueData: {app}\lib |
160 | ; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} | 160 | ; Root: HKCU; Subkey: Environment; ValueType: expandsz; ValueName: PATH; ValueData: {app} |
161 | 161 | ||
162 | [Icons] | 162 | [Icons] |
163 | Name: {group}\{cm:UninstallProgram,Imprudence}; Filename: {uninstallexe} | 163 | Name: {group}\{cm:UninstallProgram,meta-impy}; Filename: {uninstallexe} |
164 | Name: {commondesktop}\Imprudence; Filename: {app}\imprudence.exe; Tasks: desktopicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app}; IconIndex: 0 | 164 | Name: {commondesktop}\meta-impy; Filename: {app}\meta-impy.exe; Tasks: desktopicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app}; IconIndex: 0 |
165 | Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Imprudence; Filename: {app}\imprudence.exe; Tasks: quicklaunchicon; Parameters: --settings settings_imprudence.xml; WorkingDir: {app} | 165 | Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\meta-impy; Filename: {app}\meta-impy.exe; Tasks: quicklaunchicon; Parameters: --settings settings_meta-impy.xml; WorkingDir: {app} |
166 | Name: {group}\Imprudence; Filename: {app}\imprudence.exe; WorkingDir: {app}; Comment: imprudence; IconIndex: 0; Parameters: --settings settings_imprudence.xml | 166 | Name: {group}\meta-impy; Filename: {app}\meta-impy.exe; WorkingDir: {app}; Comment: meta-impy; IconIndex: 0; Parameters: --settings settings_meta-impy.xml |
167 | 167 | ||
168 | [Run] | 168 | [Run] |
169 | Filename: {app}\imprudence.exe; WorkingDir: {app}; Flags: nowait postinstall | 169 | Filename: {app}\meta-impy.exe; WorkingDir: {app}; Flags: nowait postinstall |
170 | Filename: {app}\imprudence.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different | 170 | Filename: {app}\meta-impy.url; WorkingDir: {app}; Flags: nowait postinstall shellexec; Description: See what makes Imprudence different |
171 | 171 | ||
172 | [UninstallDelete] | 172 | [UninstallDelete] |
173 | Name: {userappdata}\Imprudence\user_settings\password.dat; Type: files; Languages: | 173 | Name: {userappdata}\meta-impy\user_settings\password.dat; Type: files; Languages: |
174 | Name: {userappdata}\Imprudence\user_settings\settings.xml; Type: files; Languages: | 174 | Name: {userappdata}\meta-impy\user_settings\settings.xml; Type: files; Languages: |
175 | Name: {userappdata}\Imprudence\user_settings\settings_imprudence.xml; Type: files; Languages: | 175 | Name: {userappdata}\meta-impy\user_settings\settings_meta-impy.xml; Type: files; Languages: |
176 | ; 1.2 and lower cache location: | 176 | ; 1.2 and lower cache location: |
177 | Name: {userappdata}\Imprudence\cache; Type: filesandordirs | 177 | Name: {userappdata}\meta-impy\cache; Type: filesandordirs |
178 | ; 1.3 and higher cache location: | 178 | ; 1.3 and higher cache location: |
179 | Name: {localappdata}\Imprudence\cache; Type: filesandordirs | 179 | Name: {localappdata}\meta-impy\cache; Type: filesandordirs |
180 | Name: {userappdata}\Imprudence\logs; Type: filesandordirs | 180 | Name: {userappdata}\meta-impy\logs; Type: filesandordirs |
181 | Name: {userappdata}\Imprudence\browser_profile; Type: filesandordirs | 181 | Name: {userappdata}\meta-impy\browser_profile; Type: filesandordirs |
182 | Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs | 182 | Name: C:\Users\{username}\.gstreamer-0.10; Type: filesandordirs |
183 | Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs | 183 | Name: C:\Documents and Settings\{username}\.gstreamer-0.10; Type: filesandordirs |
184 | 184 | ||
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp b/linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp index 79fd407..79fd407 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_icon_left.bmp +++ b/linden/indra/newview/installers/windows/meta-impy_installer_icon_left.bmp | |||
Binary files differ | |||
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp b/linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp index 1c1d5dc..1c1d5dc 100644 --- a/linden/indra/newview/installers/windows/imprudence_installer_icon_right.bmp +++ b/linden/indra/newview/installers/windows/meta-impy_installer_icon_right.bmp | |||
Binary files differ | |||
diff --git a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh index 2702d71..6b0433a 100755 --- a/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh +++ b/linden/indra/newview/linux_tools/handle_secondlifeprotocol.sh | |||
@@ -13,9 +13,9 @@ fi | |||
13 | RUN_PATH=`dirname "$0" || echo .` | 13 | RUN_PATH=`dirname "$0" || echo .` |
14 | cd "${RUN_PATH}" | 14 | cd "${RUN_PATH}" |
15 | 15 | ||
16 | if [ `pidof do-not-directly-run-imprudence-bin` ]; then | 16 | if [ `pidof do-not-directly-run-meta-impy-bin` ]; then |
17 | exec dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.GoSLURL string:"$1" | 17 | exec dbus-send --type=method_call --dest=com.secondlife.ViewerAppAPIService /com/secondlife/ViewerAppAPI com.secondlife.ViewerAppAPI.GoSLURL string:"$1" |
18 | else | 18 | else |
19 | exec ./imprudence -url \'"${URL}"\' | 19 | exec ./meta-impy -url \'"${URL}"\' |
20 | fi | 20 | fi |
21 | 21 | ||
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh index a43ebd5..657ccbb 100755 --- a/linden/indra/newview/linux_tools/wrapper.sh +++ b/linden/indra/newview/linux_tools/wrapper.sh | |||
@@ -107,7 +107,7 @@ if [ -n "$LL_TCMALLOC" ]; then | |||
107 | fi | 107 | fi |
108 | fi | 108 | fi |
109 | 109 | ||
110 | export VIEWER_BINARY='do-not-directly-run-imprudence-bin' | 110 | export VIEWER_BINARY='do-not-directly-run-meta-impy-bin' |
111 | BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)') | 111 | BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)') |
112 | if [ "${BINARY_TYPE}" == "ELF 64-bit LSB executable" ]; then | 112 | if [ "${BINARY_TYPE}" == "ELF 64-bit LSB executable" ]; then |
113 | export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"${LD_LIBRARY_PATH}"' | 113 | export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib64:"`pwd`"/lib32:"${LD_LIBRARY_PATH}"' |
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 8aea221..7555c87 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp | |||
@@ -309,15 +309,15 @@ BOOL gLogoutInProgress = FALSE; | |||
309 | // Internal globals... that should be removed. | 309 | // Internal globals... that should be removed. |
310 | static std::string gArgs; | 310 | static std::string gArgs; |
311 | 311 | ||
312 | const std::string MARKER_FILE_NAME("Imprudence.exec_marker"); | 312 | const std::string MARKER_FILE_NAME("meta-impy.exec_marker"); |
313 | const std::string ERROR_MARKER_FILE_NAME("Imprudence.error_marker"); | 313 | const std::string ERROR_MARKER_FILE_NAME("meta-impy.error_marker"); |
314 | const std::string LLERROR_MARKER_FILE_NAME("Imprudence.llerror_marker"); | 314 | const std::string LLERROR_MARKER_FILE_NAME("meta-impy.llerror_marker"); |
315 | const std::string LOGOUT_MARKER_FILE_NAME("Imprudence.logout_marker"); | 315 | const std::string LOGOUT_MARKER_FILE_NAME("meta-impy.logout_marker"); |
316 | static BOOL gDoDisconnect = FALSE; | 316 | static BOOL gDoDisconnect = FALSE; |
317 | static std::string gLaunchFileOnQuit; | 317 | static std::string gLaunchFileOnQuit; |
318 | 318 | ||
319 | // Used on Win32 for other apps to identify our window (eg, win_setup) | 319 | // Used on Win32 for other apps to identify our window (eg, win_setup) |
320 | const char* const VIEWER_WINDOW_CLASSNAME = "Imprudence"; | 320 | const char* const VIEWER_WINDOW_CLASSNAME = "meta-impy"; |
321 | 321 | ||
322 | //---------------------------------------------------------------------------- | 322 | //---------------------------------------------------------------------------- |
323 | // File scope definitons | 323 | // File scope definitons |
@@ -1645,12 +1645,12 @@ bool LLAppViewer::initLogging() | |||
1645 | 1645 | ||
1646 | // Remove the last ".old" log file. | 1646 | // Remove the last ".old" log file. |
1647 | std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, | 1647 | std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, |
1648 | "Imprudence.old"); | 1648 | "meta-impy.old"); |
1649 | LLFile::remove(old_log_file); | 1649 | LLFile::remove(old_log_file); |
1650 | 1650 | ||
1651 | // Rename current log file to ".old" | 1651 | // Rename current log file to ".old" |
1652 | std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, | 1652 | std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, |
1653 | "Imprudence.log"); | 1653 | "meta-impy.log"); |
1654 | LLFile::rename(log_file, old_log_file); | 1654 | LLFile::rename(log_file, old_log_file); |
1655 | 1655 | ||
1656 | // Set the log file to Imprudence.log | 1656 | // Set the log file to Imprudence.log |
@@ -1817,7 +1817,7 @@ bool LLAppViewer::initConfiguration() | |||
1817 | // - set procedural settings | 1817 | // - set procedural settings |
1818 | gSavedSettings.setString("ClientSettingsFile", | 1818 | gSavedSettings.setString("ClientSettingsFile", |
1819 | // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global"))); | 1819 | // gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global"))); |
1820 | gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_imprudence_experimental.xml")); | 1820 | gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "settings_meta-impy_experimental.xml")); |
1821 | 1821 | ||
1822 | gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName()); | 1822 | gSavedSettings.setString("VersionChannelName", ViewerVersion::getImpViewerName()); |
1823 | 1823 | ||
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp index 0d5b884..343c1f1 100644 --- a/linden/indra/newview/llappviewerwin32.cpp +++ b/linden/indra/newview/llappviewerwin32.cpp | |||
@@ -103,7 +103,7 @@ extern "C" { | |||
103 | #endif | 103 | #endif |
104 | #endif | 104 | #endif |
105 | 105 | ||
106 | const std::string LLAppViewerWin32::sWindowClass = "Imprudence"; | 106 | const std::string LLAppViewerWin32::sWindowClass = "meta-impy"; |
107 | 107 | ||
108 | LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop) | 108 | LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *exception_infop) |
109 | { | 109 | { |
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp index 10d27cd..5397f89 100644 --- a/linden/indra/newview/llhoverview.cpp +++ b/linden/indra/newview/llhoverview.cpp | |||
@@ -286,7 +286,7 @@ void LLHoverView::updateText() | |||
286 | LLVOAvatar* avatar = (LLVOAvatar*)hit_object; | 286 | LLVOAvatar* avatar = (LLVOAvatar*)hit_object; |
287 | if (avatar->isSelf()) | 287 | if (avatar->isSelf()) |
288 | { | 288 | { |
289 | client="Client: Imprudence"; | 289 | client="Client: meta-impy"; |
290 | } | 290 | } |
291 | else | 291 | else |
292 | { | 292 | { |
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp index b744961..31647e9 100644 --- a/linden/indra/newview/llstartup.cpp +++ b/linden/indra/newview/llstartup.cpp | |||
@@ -2989,7 +2989,7 @@ std::string LLStartUp::loadPasswordFromDisk() | |||
2989 | #if LL_DARWIN | 2989 | #if LL_DARWIN |
2990 | UInt32 passwordLength; | 2990 | UInt32 passwordLength; |
2991 | char *passwordData; | 2991 | char *passwordData; |
2992 | OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, &passwordLength, (void**)&passwordData, NULL); | 2992 | OSStatus stat = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, &passwordLength, (void**)&passwordData, NULL); |
2993 | if (stat == noErr) | 2993 | if (stat == noErr) |
2994 | { | 2994 | { |
2995 | if (passwordLength == HASHED_LENGTH) | 2995 | if (passwordLength == HASHED_LENGTH) |
@@ -3037,7 +3037,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password) | |||
3037 | { | 3037 | { |
3038 | #if LL_DARWIN | 3038 | #if LL_DARWIN |
3039 | SecKeychainItemRef keychainItem; | 3039 | SecKeychainItemRef keychainItem; |
3040 | OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem); | 3040 | OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem); |
3041 | if (status == noErr) | 3041 | if (status == noErr) |
3042 | { | 3042 | { |
3043 | SecKeychainItemModifyAttributesAndData(keychainItem, NULL, hashed_password.length(), hashed_password.c_str()); | 3043 | SecKeychainItemModifyAttributesAndData(keychainItem, NULL, hashed_password.length(), hashed_password.c_str()); |
@@ -3045,7 +3045,7 @@ void LLStartUp::savePasswordToDisk(const std::string& hashed_password) | |||
3045 | } | 3045 | } |
3046 | else | 3046 | else |
3047 | { | 3047 | { |
3048 | SecKeychainAddGenericPassword(NULL, 10, "Imprudence", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL); | 3048 | SecKeychainAddGenericPassword(NULL, 10, "meta-impy", 0, NULL, hashed_password.length(), hashed_password.c_str(), NULL); |
3049 | } | 3049 | } |
3050 | #else | 3050 | #else |
3051 | std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, | 3051 | std::string filepath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, |
@@ -3080,7 +3080,7 @@ void LLStartUp::deletePasswordFromDisk() | |||
3080 | { | 3080 | { |
3081 | #if LL_DARWIN | 3081 | #if LL_DARWIN |
3082 | SecKeychainItemRef keychainItem; | 3082 | SecKeychainItemRef keychainItem; |
3083 | OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "Imprudence", 0, NULL, NULL, NULL, &keychainItem); | 3083 | OSStatus status = SecKeychainFindGenericPassword(NULL, 10, "meta-impy", 0, NULL, NULL, NULL, &keychainItem); |
3084 | if (status == noErr) | 3084 | if (status == noErr) |
3085 | { | 3085 | { |
3086 | SecKeychainItemDelete(keychainItem); | 3086 | SecKeychainItemDelete(keychainItem); |
diff --git a/linden/indra/newview/llwindebug.cpp b/linden/indra/newview/llwindebug.cpp index 62aeda4..026a7d5 100644 --- a/linden/indra/newview/llwindebug.cpp +++ b/linden/indra/newview/llwindebug.cpp | |||
@@ -870,8 +870,8 @@ void LLWinDebug::generateCrashStacks(struct _EXCEPTION_POINTERS *exception_infop | |||
870 | ExInfo.ExceptionPointers = exception_infop; | 870 | ExInfo.ExceptionPointers = exception_infop; |
871 | ExInfo.ClientPointers = NULL; | 871 | ExInfo.ClientPointers = NULL; |
872 | 872 | ||
873 | writeDumpToFile(MiniDumpNormal, &ExInfo, "Imprudence.dmp"); | 873 | writeDumpToFile(MiniDumpNormal, &ExInfo, "meta-impy.dmp"); |
874 | writeDumpToFile((MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory), &ExInfo, "ImprudencePlus.dmp"); | 874 | writeDumpToFile((MINIDUMP_TYPE)(MiniDumpWithDataSegs | MiniDumpWithIndirectlyReferencedMemory), &ExInfo, "meta-impyPlus.dmp"); |
875 | } | 875 | } |
876 | 876 | ||
877 | info = Get_Exception_Info(exception_infop); | 877 | info = Get_Exception_Info(exception_infop); |
diff --git a/linden/indra/newview/Imprudence.exe.config b/linden/indra/newview/meta-impy.exe.config index 293a9ba..293a9ba 100644 --- a/linden/indra/newview/Imprudence.exe.config +++ b/linden/indra/newview/meta-impy.exe.config | |||
diff --git a/linden/indra/newview/imprudence.url b/linden/indra/newview/meta-impy.url index 9cc3cc0..9cc3cc0 100644 --- a/linden/indra/newview/imprudence.url +++ b/linden/indra/newview/meta-impy.url | |||
diff --git a/linden/indra/newview/ImprudenceDebug.exe.config b/linden/indra/newview/meta-impyDebug.exe.config index 04d0e00..04d0e00 100644 --- a/linden/indra/newview/ImprudenceDebug.exe.config +++ b/linden/indra/newview/meta-impyDebug.exe.config | |||
diff --git a/linden/indra/newview/res-sdl/imprudence_icon.BMP b/linden/indra/newview/res-sdl/meta-impy_icon.BMP index c3f4887..c3f4887 100644 --- a/linden/indra/newview/res-sdl/imprudence_icon.BMP +++ b/linden/indra/newview/res-sdl/meta-impy_icon.BMP | |||
Binary files differ | |||
diff --git a/linden/indra/newview/res/imprudence_icon.png b/linden/indra/newview/res/meta-impy_icon.png index 8795fa7..8795fa7 100644 --- a/linden/indra/newview/res/imprudence_icon.png +++ b/linden/indra/newview/res/meta-impy_icon.png | |||
Binary files differ | |||
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc index 45e50c9..afe6988 100644 --- a/linden/indra/newview/res/viewerRes.rc +++ b/linden/indra/newview/res/viewerRes.rc | |||
@@ -74,7 +74,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | |||
74 | FONT 8, "MS Sans Serif" | 74 | FONT 8, "MS Sans Serif" |
75 | BEGIN | 75 | BEGIN |
76 | ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 | 76 | ICON IDI_LL_ICON,IDC_STATIC,7,7,20,20 |
77 | LTEXT "Loading Imprudence...",666,36,13,91,8 | 77 | LTEXT "Loading meta-impy...",666,36,13,91,8 |
78 | END | 78 | END |
79 | 79 | ||
80 | 80 | ||
@@ -154,12 +154,12 @@ BEGIN | |||
154 | BEGIN | 154 | BEGIN |
155 | BLOCK "040904b0" | 155 | BLOCK "040904b0" |
156 | BEGIN | 156 | BEGIN |
157 | VALUE "CompanyName", "Imprudence Viewer Project" | 157 | VALUE "CompanyName", "meta-impy Viewer Project" |
158 | VALUE "FileDescription", "Imprudence Experimental" | 158 | VALUE "FileDescription", "meta-impy Experimental" |
159 | VALUE "FileVersion", "2010.09.04" | 159 | VALUE "FileVersion", "2010.09.04" |
160 | VALUE "InternalName", "Imprudence Experimental" | 160 | VALUE "InternalName", "meta-impy Experimental" |
161 | VALUE "OriginalFilename", "Imprudence.exe" | 161 | VALUE "OriginalFilename", "meta-impy.exe" |
162 | VALUE "ProductName", "Imprudence Weekly" | 162 | VALUE "ProductName", "meta-impy Weekly" |
163 | VALUE "ProductVersion", "2010.09.04" | 163 | VALUE "ProductVersion", "2010.09.04" |
164 | END | 164 | END |
165 | END | 165 | END |
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png index f9ea7a2..f9ea7a2 100644 --- a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png +++ b/linden/indra/newview/skins/default/html/en-us/loading/meta-impy_loading.png | |||
Binary files differ | |||
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml index b8f3fcb..36a8f93 100644 --- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" ?><notifications> | 1 | <?xml version="1.0" ?><notifications> |
2 | 2 | ||
3 | <global name="VIEWER_NAME">Imprudence</global> | 3 | <global name="VIEWER_NAME">meta-impy</global> |
4 | <global name="VIEWER_SITE">imprudenceviewer.org</global> | 4 | <global name="VIEWER_SITE">imprudenceviewer.org</global> |
5 | <global name="SECOND_LIFE">Second Life</global> | 5 | <global name="SECOND_LIFE">Second Life</global> |
6 | <global name="SECOND_LIFE_SITE">secondlife.com</global> | 6 | <global name="SECOND_LIFE_SITE">secondlife.com</global> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml index 048005d..75c635e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_login.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_login.xml | |||
@@ -14,7 +14,7 @@ | |||
14 | %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E | 14 | %3Ctable width=%22100%%22 height=%22100%%22 border=%220%22%3E |
15 | %3Ctr%3E | 15 | %3Ctr%3E |
16 | %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E | 16 | %3Ctd align=%22center%22 valign=%22middle%22 style=%22font-size:0.8em;%22%3E |
17 | %3Cimg src=%22imprudence_loading.png%22 align=%22absmiddle%22%3E | 17 | %3Cimg src=%22meta-impy_loading.png%22 align=%22absmiddle%22%3E |
18 | %3Cbr/%3E | 18 | %3Cbr/%3E |
19 | %3CH1%3Eloading...%3C/H1%3E | 19 | %3CH1%3Eloading...%3C/H1%3E |
20 | %3C/td%3E | 20 | %3C/td%3E |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml index 2ed0869..fe19929 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml | |||
@@ -6,7 +6,7 @@ | |||
6 | left="470" name="GraphicsPreferencesHelpButton" width="22" /> | 6 | left="470" name="GraphicsPreferencesHelpButton" width="22" /> |
7 | <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall" | 7 | <check_box bottom="-23" enabled="true" follows="left|top" font="SansSerifSmall" |
8 | height="16" initial_value="false" | 8 | height="16" initial_value="false" |
9 | label="Run Imprudence in a window" left="10" mouse_opaque="true" | 9 | label="Run meta-impy in a window" left="10" mouse_opaque="true" |
10 | name="windowed mode" radio_style="false" width="100" /> | 10 | name="windowed mode" radio_style="false" width="100" /> |
11 | <check_box bottom_delta="0" enabled="true" follows="left|top" | 11 | <check_box bottom_delta="0" enabled="true" follows="left|top" |
12 | font="SansSerifSmall" height="16" initial_value="false" | 12 | font="SansSerifSmall" height="16" initial_value="false" |
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 56c2410..2c17b0c 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
@@ -129,7 +129,7 @@ class ViewerManifest(LLManifest): | |||
129 | 129 | ||
130 | # Gather up the README file, etc. | 130 | # Gather up the README file, etc. |
131 | def gather_documents(self): | 131 | def gather_documents(self): |
132 | # From the top level directory (imprudence) | 132 | # From the top level directory (meta-impy) |
133 | if self.prefix("../../..", dst=""): | 133 | if self.prefix("../../..", dst=""): |
134 | self.path("README.txt") | 134 | self.path("README.txt") |
135 | self.path("MANIFESTO.txt") | 135 | self.path("MANIFESTO.txt") |
@@ -169,7 +169,7 @@ class ViewerManifest(LLManifest): | |||
169 | def channel(self): | 169 | def channel(self): |
170 | return self.args['channel'] | 170 | return self.args['channel'] |
171 | def channel_unique(self): | 171 | def channel_unique(self): |
172 | return self.channel().replace("Imprudence", "").strip() | 172 | return self.channel().replace("meta-impy", "").strip() |
173 | def channel_oneword(self): | 173 | def channel_oneword(self): |
174 | return "".join(self.channel_unique().split()) | 174 | return "".join(self.channel_unique().split()) |
175 | def channel_lowerword(self): | 175 | def channel_lowerword(self): |
@@ -211,9 +211,9 @@ class WindowsManifest(ViewerManifest): | |||
211 | def final_exe(self): | 211 | def final_exe(self): |
212 | if self.default_channel(): | 212 | if self.default_channel(): |
213 | if self.default_grid(): | 213 | if self.default_grid(): |
214 | return "imprudence.exe" | 214 | return "meta-impy.exe" |
215 | else: | 215 | else: |
216 | return "imprudencepreview.exe" | 216 | return "meta-impypreview.exe" |
217 | else: | 217 | else: |
218 | return ''.join(self.channel().split()) + '.exe' | 218 | return ''.join(self.channel().split()) + '.exe' |
219 | 219 | ||
@@ -222,7 +222,7 @@ class WindowsManifest(ViewerManifest): | |||
222 | super(WindowsManifest, self).construct() | 222 | super(WindowsManifest, self).construct() |
223 | # the final exe is complicated because we're not sure where it's coming from, | 223 | # the final exe is complicated because we're not sure where it's coming from, |
224 | # nor do we have a fixed name for the executable | 224 | # nor do we have a fixed name for the executable |
225 | self.path(self.find_existing_file('debug/imprudence-bin.exe', 'release/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe()) | 225 | self.path(self.find_existing_file('debug/meta-impy-bin.exe', 'release/meta-impy-bin.exe', 'relwithdebinfo/meta-impy-bin.exe'), dst=self.final_exe()) |
226 | 226 | ||
227 | self.gather_documents() | 227 | self.gather_documents() |
228 | 228 | ||
@@ -231,7 +231,7 @@ class WindowsManifest(ViewerManifest): | |||
231 | self.end_prefix("../..") | 231 | self.end_prefix("../..") |
232 | 232 | ||
233 | 233 | ||
234 | self.path("imprudence.url") | 234 | self.path("meta-impy.url") |
235 | 235 | ||
236 | # Plugin host application | 236 | # Plugin host application |
237 | self.path(os.path.join(os.pardir, | 237 | self.path(os.path.join(os.pardir, |
@@ -320,17 +320,17 @@ class WindowsManifest(ViewerManifest): | |||
320 | self.end_prefix() | 320 | self.end_prefix() |
321 | 321 | ||
322 | # The config file name needs to match the exe's name. | 322 | # The config file name needs to match the exe's name. |
323 | self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") | 323 | self.path(src="%s/meta-impy-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config") |
324 | 324 | ||
325 | # We need this one too, so that llkdu loads at runtime - DEV-41194 | 325 | # We need this one too, so that llkdu loads at runtime - DEV-41194 |
326 | #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config") | 326 | #self.path(src="%s/meta-impy-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config") |
327 | self.path("llkdu.dll.2.config") | 327 | self.path("llkdu.dll.2.config") |
328 | 328 | ||
329 | # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004 | 329 | # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004 |
330 | #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config") | 330 | #self.path(src="%s/meta-impy-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config") |
331 | 331 | ||
332 | # same thing for auto-updater. | 332 | # same thing for auto-updater. |
333 | #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="updater.exe.config") | 333 | #self.path(src="%s/meta-impy-bin.exe.config" % self.args['configuration'], dst="updater.exe.config") |
334 | 334 | ||
335 | # Vivox runtimes | 335 | # Vivox runtimes |
336 | if self.prefix(src="vivox-runtime/i686-win32", dst=""): | 336 | if self.prefix(src="vivox-runtime/i686-win32", dst=""): |
@@ -491,36 +491,36 @@ class WindowsManifest(ViewerManifest): | |||
491 | if self.default_channel(): | 491 | if self.default_channel(): |
492 | if self.default_grid(): | 492 | if self.default_grid(): |
493 | # release viewer | 493 | # release viewer |
494 | installer_file = "Imprudence_%(version_dashes)s_Setup.exe" | 494 | installer_file = "meta-impy_%(version_dashes)s_Setup.exe" |
495 | grid_vars_template = """ | 495 | grid_vars_template = """ |
496 | OutFile "%(installer_file)s" | 496 | OutFile "%(installer_file)s" |
497 | !define INSTFLAGS "%(flags)s" | 497 | !define INSTFLAGS "%(flags)s" |
498 | !define INSTNAME "Imprudence" | 498 | !define INSTNAME "meta-impy" |
499 | !define SHORTCUT "Imprudence" | 499 | !define SHORTCUT "meta-impy" |
500 | !define URLNAME "imprudence" | 500 | !define URLNAME "meta-impy" |
501 | Caption "Imprudence ${VERSION}" | 501 | Caption "meta-impy ${VERSION}" |
502 | """ | 502 | """ |
503 | else: | 503 | else: |
504 | # beta grid viewer | 504 | # beta grid viewer |
505 | installer_file = "Imprudence_%(version_dashes)s_(%(grid_caps)s)_Setup.exe" | 505 | installer_file = "meta-impy_%(version_dashes)s_(%(grid_caps)s)_Setup.exe" |
506 | grid_vars_template = """ | 506 | grid_vars_template = """ |
507 | OutFile "%(installer_file)s" | 507 | OutFile "%(installer_file)s" |
508 | !define INSTFLAGS "%(flags)s" | 508 | !define INSTFLAGS "%(flags)s" |
509 | !define INSTNAME "Imprudence%(grid_caps)s" | 509 | !define INSTNAME "meta-impy%(grid_caps)s" |
510 | !define SHORTCUT "Imprudence (%(grid_caps)s)" | 510 | !define SHORTCUT "meta-impy (%(grid_caps)s)" |
511 | !define URLNAME "imprudence%(grid)s" | 511 | !define URLNAME "meta-impy%(grid)s" |
512 | !define UNINSTALL_SETTINGS 1 | 512 | !define UNINSTALL_SETTINGS 1 |
513 | Caption "Imprudence %(grid)s ${VERSION}" | 513 | Caption "meta-impy %(grid)s ${VERSION}" |
514 | """ | 514 | """ |
515 | else: | 515 | else: |
516 | # some other channel on some grid | 516 | # some other channel on some grid |
517 | installer_file = "Imprudence_%(version_dashes)s_%(channel_oneword)s_Setup.exe" | 517 | installer_file = "meta-impy_%(version_dashes)s_%(channel_oneword)s_Setup.exe" |
518 | grid_vars_template = """ | 518 | grid_vars_template = """ |
519 | OutFile "%(installer_file)s" | 519 | OutFile "%(installer_file)s" |
520 | !define INSTFLAGS "%(flags)s" | 520 | !define INSTFLAGS "%(flags)s" |
521 | !define INSTNAME "Imprudence%(channel_oneword)s" | 521 | !define INSTNAME "meta-impy%(channel_oneword)s" |
522 | !define SHORTCUT "%(channel)s" | 522 | !define SHORTCUT "%(channel)s" |
523 | !define URLNAME "imprudence" | 523 | !define URLNAME "meta-impy" |
524 | !define UNINSTALL_SETTINGS 1 | 524 | !define UNINSTALL_SETTINGS 1 |
525 | Caption "%(channel)s ${VERSION}" | 525 | Caption "%(channel)s ${VERSION}" |
526 | """ | 526 | """ |
@@ -530,7 +530,7 @@ class WindowsManifest(ViewerManifest): | |||
530 | installer_file = installer_file % substitution_strings | 530 | installer_file = installer_file % substitution_strings |
531 | substitution_strings['installer_file'] = installer_file | 531 | substitution_strings['installer_file'] = installer_file |
532 | 532 | ||
533 | tempfile = "imprudence_setup_tmp.nsi" | 533 | tempfile = "meta-impy_setup_tmp.nsi" |
534 | # the following replaces strings in the nsi template | 534 | # the following replaces strings in the nsi template |
535 | # it also does python-style % substitution | 535 | # it also does python-style % substitution |
536 | self.replace_in("installers/windows/installer_template.nsi", tempfile, { | 536 | self.replace_in("installers/windows/installer_template.nsi", tempfile, { |
@@ -562,11 +562,11 @@ class WindowsManifest(ViewerManifest): | |||
562 | class DarwinManifest(ViewerManifest): | 562 | class DarwinManifest(ViewerManifest): |
563 | def construct(self): | 563 | def construct(self): |
564 | # copy over the build result (this is a no-op if run within the xcode script) | 564 | # copy over the build result (this is a no-op if run within the xcode script) |
565 | self.path(self.args['configuration'] + "/Imprudence.app", dst="") | 565 | self.path(self.args['configuration'] + "/meta-impy.app", dst="") |
566 | 566 | ||
567 | if self.prefix(src="", dst="Contents"): # everything goes in Contents | 567 | if self.prefix(src="", dst="Contents"): # everything goes in Contents |
568 | 568 | ||
569 | self.path("Info-Imprudence.plist", dst="Info.plist") | 569 | self.path("Info-meta-impy.plist", dst="Info.plist") |
570 | 570 | ||
571 | # copy additional libs in <bundle>/Contents/MacOS/ | 571 | # copy additional libs in <bundle>/Contents/MacOS/ |
572 | if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"): | 572 | if (not self.standalone()) and self.prefix(src="../../libraries/universal-darwin/lib_release", dst="MacOS/"): |
@@ -802,16 +802,16 @@ class DarwinManifest(ViewerManifest): | |||
802 | 802 | ||
803 | 803 | ||
804 | def package_finish(self): | 804 | def package_finish(self): |
805 | channel_standin = 'Imprudence' # hah, our default channel is not usable on its own | 805 | channel_standin = 'meta-impy' # hah, our default channel is not usable on its own |
806 | if not self.default_channel(): | 806 | if not self.default_channel(): |
807 | channel_standin = self.channel() | 807 | channel_standin = self.channel() |
808 | 808 | ||
809 | imagename="Imprudence_" + '_'.join(self.args['version']) | 809 | imagename="meta-impy_" + '_'.join(self.args['version']) |
810 | 810 | ||
811 | # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning. | 811 | # MBW -- If the mounted volume name changes, it breaks the .DS_Store's background image and icon positioning. |
812 | # If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick. | 812 | # If we really need differently named volumes, we'll need to create multiple DS_Store file images, or use some other trick. |
813 | 813 | ||
814 | volname="Imprudence Installer" # DO NOT CHANGE without understanding comment above | 814 | volname="meta-impy Installer" # DO NOT CHANGE without understanding comment above |
815 | 815 | ||
816 | if self.default_channel(): | 816 | if self.default_channel(): |
817 | if not self.default_grid(): | 817 | if not self.default_grid(): |
@@ -838,7 +838,7 @@ class DarwinManifest(ViewerManifest): | |||
838 | # Copy everything in to the mounted .dmg | 838 | # Copy everything in to the mounted .dmg |
839 | 839 | ||
840 | if self.default_channel() and not self.default_grid(): | 840 | if self.default_channel() and not self.default_grid(): |
841 | app_name = "Imprudence " + self.args['grid'] | 841 | app_name = "meta-impy " + self.args['grid'] |
842 | else: | 842 | else: |
843 | app_name = channel_standin.strip() | 843 | app_name = channel_standin.strip() |
844 | 844 | ||
@@ -891,12 +891,12 @@ class LinuxManifest(ViewerManifest): | |||
891 | def construct(self): | 891 | def construct(self): |
892 | super(LinuxManifest, self).construct() | 892 | super(LinuxManifest, self).construct() |
893 | 893 | ||
894 | self.path("res/imprudence_icon.png","imprudence_icon.png") | 894 | self.path("res/meta-impy_icon.png","meta-impy_icon.png") |
895 | if self.prefix("linux_tools", dst=""): | 895 | if self.prefix("linux_tools", dst=""): |
896 | #self.path("client-readme.txt","README-linux.txt") | 896 | #self.path("client-readme.txt","README-linux.txt") |
897 | self.path("client-readme-voice.txt","README-linux-voice.txt") | 897 | self.path("client-readme-voice.txt","README-linux-voice.txt") |
898 | #self.path("client-readme-joystick.txt","README-linux-joystick.txt") | 898 | #self.path("client-readme-joystick.txt","README-linux-joystick.txt") |
899 | self.path("wrapper.sh","imprudence") | 899 | self.path("wrapper.sh","meta-impy") |
900 | self.path("handle_secondlifeprotocol.sh") | 900 | self.path("handle_secondlifeprotocol.sh") |
901 | self.path("register_secondlifeprotocol.sh") | 901 | self.path("register_secondlifeprotocol.sh") |
902 | self.end_prefix("linux_tools") | 902 | self.end_prefix("linux_tools") |
@@ -933,7 +933,7 @@ class LinuxManifest(ViewerManifest): | |||
933 | if 'installer_name' in self.args: | 933 | if 'installer_name' in self.args: |
934 | installer_name = self.args['installer_name'] | 934 | installer_name = self.args['installer_name'] |
935 | else: | 935 | else: |
936 | installer_name_components = ['Imprudence_', self.args.get('arch')] | 936 | installer_name_components = ['meta-impy_', self.args.get('arch')] |
937 | installer_name_components.extend(self.args['version']) | 937 | installer_name_components.extend(self.args['version']) |
938 | installer_name = "_".join(installer_name_components) | 938 | installer_name = "_".join(installer_name_components) |
939 | if self.default_channel(): | 939 | if self.default_channel(): |
@@ -980,9 +980,9 @@ class Linux_i686Manifest(LinuxManifest): | |||
980 | def construct(self): | 980 | def construct(self): |
981 | super(Linux_i686Manifest, self).construct() | 981 | super(Linux_i686Manifest, self).construct() |
982 | if self.debug(): | 982 | if self.debug(): |
983 | self.path("imprudence-bin","bin/do-not-directly-run-imprudence-bin") | 983 | self.path("meta-impy-bin","bin/do-not-directly-run-meta-impy-bin") |
984 | else: | 984 | else: |
985 | self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin") | 985 | self.path("meta-impy-stripped","bin/do-not-directly-run-meta-impy-bin") |
986 | 986 | ||
987 | self.path("../llcommon/libllcommon.so", "lib/libllcommon.so") | 987 | self.path("../llcommon/libllcommon.so", "lib/libllcommon.so") |
988 | 988 | ||
@@ -1101,9 +1101,9 @@ class Linux_x86_64Manifest(LinuxManifest): | |||
1101 | def construct(self): | 1101 | def construct(self): |
1102 | super(Linux_x86_64Manifest, self).construct() | 1102 | super(Linux_x86_64Manifest, self).construct() |
1103 | if self.debug(): | 1103 | if self.debug(): |
1104 | self.path("imprudence-bin","bin/do-not-directly-run-imprudence-bin") | 1104 | self.path("meta-impy-bin","bin/do-not-directly-run-meta-impy-bin") |
1105 | else: | 1105 | else: |
1106 | self.path("imprudence-stripped","bin/do-not-directly-run-imprudence-bin") | 1106 | self.path("meta-impy-stripped","bin/do-not-directly-run-meta-impy-bin") |
1107 | # self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin") | 1107 | # self.path("../linux_crash_logger/linux-crash-logger-stripped","linux-crash-logger.bin") |
1108 | 1108 | ||
1109 | self.path("../llcommon/libllcommon.so", "lib64/libllcommon.so") | 1109 | self.path("../llcommon/libllcommon.so", "lib64/libllcommon.so") |
diff --git a/linden/indra/newview/viewerversion.cpp b/linden/indra/newview/viewerversion.cpp index 95c8f76..3678cb4 100644 --- a/linden/indra/newview/viewerversion.cpp +++ b/linden/indra/newview/viewerversion.cpp | |||
@@ -40,7 +40,7 @@ S32 ViewerVersion::sVersionMinor = 0; | |||
40 | S32 ViewerVersion::sVersionPatch = 0; | 40 | S32 ViewerVersion::sVersionPatch = 0; |
41 | std::string ViewerVersion::sVersionTest = ""; | 41 | std::string ViewerVersion::sVersionTest = ""; |
42 | 42 | ||
43 | const std::string ViewerVersion::sViewerName = "Imprudence"; | 43 | const std::string ViewerVersion::sViewerName = "meta-impy"; |
44 | 44 | ||
45 | ViewerVersion::ViewerVersion() | 45 | ViewerVersion::ViewerVersion() |
46 | { | 46 | { |
diff --git a/linden/indra/win_updater/updater.cpp b/linden/indra/win_updater/updater.cpp index 5031270..2e78296 100644 --- a/linden/indra/win_updater/updater.cpp +++ b/linden/indra/win_updater/updater.cpp | |||
@@ -454,11 +454,11 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho | |||
454 | if (gTotalBytesRead < (1024 * 1024) && ! cancelled) | 454 | if (gTotalBytesRead < (1024 * 1024) && ! cancelled) |
455 | { | 455 | { |
456 | MessageBox(gWindow, | 456 | MessageBox(gWindow, |
457 | L"The Imprudence auto-update has failed.\n" | 457 | L"The meta-impy auto-update has failed.\n" |
458 | L"The problem may be caused by other software installed \n" | 458 | L"The problem may be caused by other software installed \n" |
459 | L"on your computer, such as a firewall.\n" | 459 | L"on your computer, such as a firewall.\n" |
460 | L"Please visit http://imprudenceviewer.org/download/ \n" | 460 | L"Please visit http://imprudenceviewer.org/download/ \n" |
461 | L"to download the latest version of Imprudence.\n", | 461 | L"to download the latest version of meta-impy.\n", |
462 | NULL, MB_OK); | 462 | NULL, MB_OK); |
463 | return 1; | 463 | return 1; |
464 | } | 464 | } |
@@ -472,7 +472,7 @@ WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nSho | |||
472 | if (!success) | 472 | if (!success) |
473 | { | 473 | { |
474 | MessageBox(gWindow, | 474 | MessageBox(gWindow, |
475 | L"Imprudence download failed.\n" | 475 | L"meta-impy download failed.\n" |
476 | L"Please try again later.", | 476 | L"Please try again later.", |
477 | NULL, MB_OK); | 477 | NULL, MB_OK); |
478 | return 1; | 478 | return 1; |