a1c69da326
QAR-1619: Fix Windows link errors when building INTEGRATION_TEST_lllazy.
...
The problem arose because we were setting LL_COMMON_BUILD in
llcommon/CMakeLists.txt, not only for the library build itself but also for
its LL_ADD_INTEGRATION_TEST tests. This told all the headers compiled into the
INTEGRATION_TEST_lllazy executable that the executable was providing all the
llcommon symbols, rather than importing them.
The solution is to switch to the llcommon_EXPORTS symbol automagically defined
by CMake when building the llcommon shared library itself.
2009-09-03 16:50:44 -04:00
ae6c3d7d6c
build issue - const invariance in llplugintest/llmediaplugintest
2009-09-03 02:57:14 +00:00
295dfd4351
DEV-31909 Revise strings.xml used in LSL editor hovertips
...
We are not going to use \n in the XML to refer to a newline in the official viewer. I changed these to a real CRLF.
2009-09-03 00:20:39 +00:00
22bbba4dd4
DEV-39355 Remove ctrl-alt-V shortcut for View Admin Options
2009-09-02 23:06:00 +00:00
afea10ebc9
On Mac, move SLPlugin executable to the same directory as the viewer executable.
...
Change LLDir_Mac::getLLPluginLauncher() to look in the viewer's executable dir
instead of in the plugins dir. Change viewer_manifest.py's
DarwinManifest.construct() to put SLPlugin in the new location.
SLPlugin is being linked with our new libllcommon.dylib, which self-identifies
as being findable via @executable_path/../Resources/libllcommon.dylib. This
doesn't work from the Resources/llplugin subdir -- the above relative path
ends up looking in the nonexistent Resources/Resources subdirectory. Putting
SLPlugin in the Contents/MacOS directory with the viewer executable solves the
problem.
2009-09-02 17:38:46 -04:00
c0681e561a
DEV-38453 (part 1)
...
- need to refer to the correct button in the help text for new Pref > Graphics layout
- need to rename nodes in Pref > General that have the OPPOSITE meaning as viewer 1.23; we intentionally want to disconnect these from their prior, opposite translation
2009-09-02 21:11:44 +00:00
1f881a743a
Update XUI for Me Pick Info and Me Edit Edit Pick Info panels in sidetray to match updated style guide. EXT-805
2009-09-02 18:09:50 +00:00
5612f13dc8
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3
...
* Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801
* New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
2009-09-02 02:59:07 +00:00
1a5cb4fbfb
Made floater_media_browser.xml a single instance.
2009-09-02 02:01:55 +00:00
0f0853a6fe
Fix up some more post-merge breakage.
2009-09-01 18:16:04 -04:00
40743eaf99
Try double-quoting backslashes
2009-09-01 13:36:08 -07:00
8d8e309bfe
Merge whitespace-only changes
2009-09-01 16:11:27 -04:00
5da7db5571
RunBuildTest.cmake definitely needs the separate_arguments() command, else
...
when you pass in a command string with command-line arguments,
RunBuildTest.cmake attempts to search for a program whose filename is the
entire command line. Uncommented separate_arguments().
Added SHARED_LIB_STAGING_DIR to LL_ADD_INTEGRATION_TEST LD_LIBRARY_PATH.
2009-09-01 16:01:55 -04:00
dd628f29af
Use rev numbers instead of changeset IDs for now.
2009-09-01 11:54:34 -07:00
02a1b5ea08
DEV-39252 fix duplicate name= elements in the EN xui. This breaks localization, please dont do it.
2009-09-01 18:40:07 +00:00
5f3a7fa6f3
Patch in some other useful scripts from trunk.
2009-09-01 11:18:33 -07:00
d508beb044
Add hg metadata files
2009-09-01 11:14:33 -07:00
52708727f4
Merge with SVN viewer-2.0.0-3 branch
2009-09-01 11:08:44 -07:00
3e5819d862
Trivial commit for hg import purposes
2009-09-01 18:01:40 +00:00
359fb94741
Sync up with a number of SVN changes that snuck in via weird merges
2009-09-01 11:04:15 -07:00
5e4edfb83f
Fixups for eol-style copy pasta...
2009-09-01 13:12:17 -04:00
04d2c459b9
Fixup for closing paren dropped in the merge.
2009-09-01 13:11:10 -04:00
bae94e4340
Merged login-api with viewer-2.0.0-3 up through r132290.
2009-09-01 12:21:51 -04:00
3dc23bc183
Merged in nat's ucontext fix on osx 10.5.
2009-09-01 12:05:35 -04:00
a6ff5974c3
Also quite the backslashes in the argument for the sign command
2009-09-01 09:00:02 -07:00
3069355a6f
DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled tests
2009-09-01 14:41:04 +00:00
1a6be4eb17
Quote any backslashes so they get preserved when invoking python.
2009-08-31 20:09:56 -07:00
cbad737f59
Fix syntax error introduced by your's truely into develop.py
2009-09-01 01:46:05 +00:00
7eafa3209c
Fix syntax error in viewer_manifest.py
2009-08-31 18:34:03 -07:00
778b893212
EXT-791 - Add "Pause Agent" option to the Debug > Network menu
2009-09-01 01:03:51 +00:00
01d957c3e4
Add retry logic on certain exit codes
2009-09-01 00:55:00 +00:00
2149be5df2
Attempt to invoke the code signer differently
2009-08-31 17:16:02 -07:00
81d3f7ec6b
Post-merge cleanups (ported llstartup.cpp changes to where the surrounding code has been moved to in LLLoginInstance and LLAppViewer)
2009-08-31 20:00:09 -04:00
e20ac4718e
Updated Me Profile and spec generated by 80/20. Removed Edit options for public profile display. Description of task in EXT-770
2009-08-31 23:28:56 +00:00
410e2228fd
Removed some final dependencies to Awesomium and Flash ActiveX (mostly porting over Callum's change: r132166)
...
DEV-39138 build process on parabuild fails due to missing flash activex plugin
2009-08-31 23:08:06 +00:00
3df557435f
Post-merge cleanups (adding LL_COMMON_API declarations)
2009-08-31 18:43:12 -04:00
abf683fe6f
Post-merge cleanups (stage_third_party_libs is the new copy_win_libs)
2009-08-31 18:42:28 -04:00
5e7034a53b
EXT-785 Remove old art resources from viewer
2009-08-31 22:39:14 +00:00
f4f02f0f34
Fix up some post-merge breakage.
2009-08-31 15:09:13 -07:00
30ff6cabd6
Merge with trunk
2009-08-31 13:47:47 -07:00
89de8e5b55
Port over the new build scripts from para-test, tweek update_version_files to use the repo revision number for now.
2009-08-31 13:26:35 -07:00
3ac3a4b206
sheesh, finish(?) gutting the flash stuff out of DEV-31438
2009-08-31 18:46:54 +00:00
e77338c956
Updated Me Profile and Me Edit Profile xml files to match new spec generated by 80/20. Description of task in EXT-770
2009-08-31 17:46:13 +00:00
158946668a
svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
...
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
6dbef5f2a4
Standardized layouts, changed commitment model labels to ok/cancel, modernized advanced floaters.
2009-08-31 05:21:50 +00:00
491f9fc986
Add magic -D switch to work around OS X 10.5 bug in ucontext.h
2009-08-29 10:35:41 -04:00
a1ed9ccf73
Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3
...
Includes:
* DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips
* DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor
* Some cleanup to llerror so that it doesn't depend on llfixedbuffer
* A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
2009-08-29 06:23:41 +00:00
c4384d64a1
EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted menu_minimap.xml (translations all have menu_mini_map.xml)
2009-08-29 01:47:33 +00:00
10459c79e7
EXT-614 Object inventory does not update to show inventory created or placed in the object.
...
Reviewed by: Seraph
2009-08-29 01:08:39 +00:00
558897b4b9
svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5
...
In the webkit plugin, don't try to load web browser plugins except on Windows. The flash plugin on the Mac crashes the webkit plugin when running under xcode.
2009-08-29 01:08:36 +00:00
Nat Goodspeed