| Age | Commit message (Collapse) | Author |
|
world. This solves black bars while logging in problem
merge -r 126570 skinning-15 viewer-2.0.0-3
reviewed by Austin
|
|
|
|
onOpen for LLFloaterInspect. Reviewed by Richard.
|
|
the joystick setup floater.
|
|
viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
|
|
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.
|
|
incorrectly specified. Not reviewed.
|
|
discoverable. Not reviewed.
|
|
DEV-34721 "Streaming Media" checkbox
DEV-34723 Mouse sensitivity slider
Reviewed by James
|
|
"not implement yet" or some such
Reviewed by James
|
|
|
|
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
|
|
|
|
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
|
|
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
|
|
when setting parent
|
|
new --nonotifications command line option for automated testing
Reviewed by Q
|
|
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.
|
|
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
|
|
use consistent line feeds (had ^M after first header line). Not reviewed.
|
|
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.
|
|
Boost.Signals2 like the rest of the event-system-n code.
|
|
already exist to avoid recursive floater construction.
|
|
|
|
|
|
ignore-dead-branch
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
|
|
|
|
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
|
|
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
|
|
Reviewed by Mani.
|
|
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
|
|
|
|
|
|
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
|
|
the XML files.
|
|
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10
DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
|
|
VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merging from server-1.26 to trunk
Only a few conflicts:
scripts/farm_distribute : the upload rate in trunk was even more
conservative than the one I switched to in
1.26, so kept the trunk version.
indra/llcommon/llversionserver.h : did svn revert to keep trunk
indra/newsim/lltask.cpp : svn is weird. The merge conflict was one
that it's not obvious why it was there.
However, Simon and I looked at it, and the
solution was obvious : keep the trunk blob
where the conflict was flagged.
indra/lib/python : conflict was differing versions of the eventlib
extern. did svn revert . to keep trunk.
|
|
These files haven't been touched in years.
Reviewed by Richard.
|
|
This is much less painful than maintaining that list by hand, since
we don't use those files for actual builds.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-1361
Merging in QAR-1361.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732
QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST
improvements - combo merge
|
|
for slideshow, added final art, fixed UserAgent. Added 1-line comment to llstartup.cpp about updater URL. Going into trunk because it's not tied to a viewer release and the functional code has been through QA elsewhere. OK by Steve/Q. Reviewed with Kelly.
svn merge -r113629:113831 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-4
|
|
svn merge -r112338-112378 svn+ssh://svn/lindenlab.com/svn/linden/branches/viewer/viewer_1-22
to trunk
|