Richard Nelson
75e1187f31
EXT-126 - Grayed empty field appears after minimize the 'Search Second Life' dlg
...
EXT-124 - Empty local chat window appears after the viewer was resized
reviewed by Austin
2009-07-09 01:07:03 +00:00
Richard Nelson
3c956af81c
DEV-35121 when taking a snapshot without UI, use full window to render world. This solves black bars while logging in problem
...
merge -r 126570 skinning-15 viewer-2.0.0-3
reviewed by Austin
2009-07-09 01:05:44 +00:00
Austin Doupnik
394b28ce77
DEV-35112 Renamed colors_def.xml to colors.xml. Reviewed by Richard.
2009-07-09 00:59:52 +00:00
Austin Doupnik
163f89d77f
DEV-34748 Moved logic for setting inspection tools from construction to onOpen for LLFloaterInspect. Reviewed by Richard.
2009-07-08 22:36:39 +00:00
Austin Doupnik
ea1196cf01
Gave width attributes to ZoomDirect, Cursor3D, and AutoLeveling options in the joystick setup floater.
2009-07-08 20:27:45 +00:00
Steven Bennetts
f26f7e3e29
merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0
...
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
2009-07-08 05:19:19 +00:00
James Cook
c5d100a9e4
EXT-133 Crash when teleporting from "About Landmark" dialog. If the dialog was closed before the simulator returned information about the land parcel, LLRemoteParcelRequestResponder would dereference a null observer/panel pointer. Introduced into viewer-2.0.0-2 revision 124991 from Product Engine merge, see https://svn.lindenlab.com/viewvc/viewvc.cgi/linden/branches/viewer/viewer-2.0.0-2-pe/indra/newview/llremoteparcelrequest.cpp?r1=124880&r2=124881&pathrev=124881&limit_changes=100 Reviewed with Richard.
2009-07-08 00:05:02 +00:00
James Cook
b2052d69d6
About Second Life now works from the login screen, floater name was incorrectly specified. Not reviewed.
2009-07-07 18:22:43 +00:00
James Cook
676c829202
DEV-34433 Put "About Second Life" back directly under "Help" to make it more discoverable. Not reviewed.
2009-07-07 18:13:41 +00:00
Jiao Li
9eeda70f12
DEV-34720 Mute all
...
DEV-34721 "Streaming Media" checkbox
DEV-34723 Mouse sensitivity slider
Reviewed by James
2009-07-07 10:27:50 +00:00
Adam Moss
541e0b1dfc
cherrypicking the fix for linux startup issue DEV-33209 - the bug has percolated
...
around for so long without the fix that I can't stand it any longer.
svn merge -c123659
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-15-sandbox-3
2009-07-07 10:23:45 +00:00
Jiao Li
474fdccc2a
make right-side ^^ chevron button and mail icon button spawn a dialog saying "not implement yet" or some such
...
Reviewed by James
2009-07-07 08:55:15 +00:00
James Cook
a4eef8ee55
Fix Linux build - failing due to warning about S32/float conversion
2009-07-07 04:11:41 +00:00
James Cook
52aeaa3284
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
...
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
Xiaohong Bao
2c722655bd
fix for DEV-34094: texture console stats are obscured by the loading textures
2009-07-06 23:47:11 +00:00
James Cook
d6101558a1
Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
...
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
Steven Bennetts
39905b927d
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
2009-07-02 00:38:13 +00:00
Austin Doupnik
687cff0eb8
[EXT-68] Fixed dynamic_cast on partially destroyed object bug that was breaking menu branching.
2009-06-30 21:34:46 +00:00
Xiaohong Bao
cb8641a639
fix for DEV-27483/SEC-283: Viewer crash: LLXform::setParent Creating loop when setting parent
2009-06-27 01:05:56 +00:00
Kyle Ambroff
6f613fb70f
Fix broken Linux server build.
...
llwindow refactoring in skinning-7 r117641 added dependency on
LLWindowCallbacks in llwindowheadless, which was not being built
for server only builds.
* Include llwindowcallbacks.cpp in all llwindow builds.
* Do not link with libatk and libsdl for server linux builds, since
they are not needed and only packaged for the viewer.
Reviewed with James.
2009-06-26 23:47:36 +00:00
Palmer Truelson
e2655d4c4b
DEV-34569
...
new --nonotifications command line option for automated testing
Reviewed by Q
2009-06-26 12:17:35 +00:00
James Cook
572ee5c9db
DEV-34488 Can not save script to a prim. Underlying issue was LLPreview holding two member variables mObjectUUID and mObjectID. mObjectID was null for scripts. It appears to be used only for notecards (?), so I converted it to mNotecardObjectID and switched references to point to mObjectUUID. Renamed one other variable to mSaveObjectID for clarity. Removed unnecessary include files and de-inlined a couple functions because I was there. Reviewed with Steve.
2009-06-25 18:41:04 +00:00
Loren Shih
a00af78b95
merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-24 21:36:42 +00:00
James Cook
2ce76c7ed4
Set correct svn:eol-style native on XML files, converted several files to use consistent line feeds (had ^M after first header line). Not reviewed.
2009-06-23 23:32:39 +00:00
James Cook
68da2bdfee
Merge build patch for Linux server builds from xui-army. I believe this fixes the "llui_libtest -lllui not found" build error.
...
Merging revisions 123378-123379 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army into G:\viewer-2-0-link\latest, respecting ancestry
2009-06-23 22:54:48 +00:00
James Cook
fe487f46e3
Fixed a bunch of missing includes and forward declares. I was trying to benchmark with precompiled headers off, but we'll have to do a bunch more cleanup before it's possible to disable that feature cleanly. Not reviewed.
2009-06-23 21:59:31 +00:00
Nat Goodspeed
fcaa1ad46f
QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
...
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22 12:52:18 +00:00
Adam Moss
844ce9bf88
trivial comment fixes for typos that were bugging me...
2009-06-22 12:03:54 +00:00
Steven Bennetts
401d51231f
Modified RecordToChatConsole to not construct LLFloaterChat if it doesn't already exist to avoid recursive floater construction.
2009-06-21 21:52:41 +00:00
Steven Bennetts
33dbf11076
Fixed a shutdown crash.
2009-06-21 17:51:35 +00:00
Steven Bennetts
ade6bbb06c
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
2009-06-21 17:16:27 +00:00
Steven Bennetts
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Paul Oppenheim
351ebe9fcb
result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
2009-06-19 23:24:11 +00:00
Christian Goetze
c90c3630ab
Fix one more license, add indra/newview/tests to exported tree
2009-06-04 21:18:04 +00:00
Christian Goetze
a845b78268
Fix licensing, also make the unzipping quieter, so that license error messages are easier to see in the log.
2009-06-04 20:43:12 +00:00
Brad Kittenbrink
087bd26553
Merge of QAR-1383 event-system-7 into trunk.
...
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
Christian Goetze
f9b9372027
Remove -parallelizeTargets from xcodebuild invocation, it seems to not work well enough
2009-06-03 23:18:22 +00:00
Bryan O'Sullivan
af91e85531
Small braino
2009-06-02 17:25:54 +00:00
Adam Moss
9dfe0ca9a0
svn merge -r121194:121210
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-22 09:58:47 +00:00
Christian Goetze
93cf3d89e5
Put the os.environ["DISTCC"] = ... call into main()
2009-05-21 21:25:09 +00:00
Christian Goetze
77c1e2b761
Fix develop.py putenv bug, use new etch build-linux hosts for parabuild.
2009-05-21 20:59:56 +00:00
Bryan O'Sullivan
fb309e781e
Windows: make dbghelp.dll an installable package
...
Reviewed by Mani.
2009-05-20 22:25:32 +00:00
Mark Palange
8c5ca38f1d
Fix to develop.py to build on 64 bit windows.
...
Added March 2009 DirectX SDK to cmake config.
Reviewed by brad
2009-05-19 23:41:59 +00:00
Robert Knop
d43bd2cfdd
Now that 1.27 has branched away, bumping the version number to 1.29 to
...
mean "the development version between release versions 1.27 and 1.30".
2009-05-19 21:18:49 +00:00
Robert Knop
9a8d069902
svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merging server-1.26 back to trunk.
Two conflicts -- llversionserver.hh (kept the trunk version)
and in llsimparcelmgr.cpp -- also kept the trunk version. There was
some code in 1.26 that included error
printing from RDW that says "we should
really not be hitting this code", and that
code was gone in trunk... so, went ahead
and kept the trunk part of that one
conflict in that file.
2009-05-19 17:16:44 +00:00
Robert Knop
99660542bb
Adding back the setting of "DEBUG", the lack of which caused many unit
...
tests to fail.
2009-05-19 15:19:39 +00:00
Aaron Brashears
6df2755ba6
Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-18 23:38:35 +00:00
Christian Goetze
0257214763
Set DISTCC_DIR to a location inside the source tree to avoid causing NFS trouble with the default setting.
2009-05-14 21:20:37 +00:00
Christian Goetze
65c86eadcb
Max out distcc jobs to 12 in develop.py
2009-05-14 20:56:03 +00:00
Christian Goetze
32100098f5
There are 71 eniacs, not just 64
2009-05-14 20:26:00 +00:00