viewer.git/indra/newview/llfloaterurldisplay.cpp, branch 26.3Megapahit's fork of the Second Life viewer.
https://megapahit.org/viewer.git/atom?h=26.32010-08-24T18:22:00ZBacked out changeset c3d41f18ce2b2010-08-24T18:22:00ZTofu Lindentofu.linden@lindenlab.com2010-08-24T18:22:00Zurn:sha1:e416840f85dc4a367894036b9fe483f17d959c54
back-out the back-out for this branch. yay.
Backed out changeset a62bf7c0af212010-08-24T17:44:39ZTofu Lindentofu.linden@lindenlab.com2010-08-24T17:44:39Zurn:sha1:98cc2365034a93c69704daa69efb389799cc9627
Backing out this merge that I pushed (prematurely) to the wrong place.
Bury the dead code day: Removed LLFloaterParcelInfo, LLFloaterURLDisplay and LLPanelPlace2010-07-19T12:23:19ZAimee Lindenaimee@lindenlab.com2010-07-19T12:23:19Zurn:sha1:e48e1e32d8543fb930f45b7eb98e28ce17cd29b8
Moved LLParcelHandler from now defunct llfloaterparcel.cpp to llpanelplaces.cpp
Refactoring of llviewerprecompiledheaders.h to hopefully increase stability2009-11-14T01:33:59Zbrad kittenbrinkbrad@lindenlab.com2009-11-14T01:33:59Zurn:sha1:1ea60591a9b5f46a66527497b7b14b843a663de8
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
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:2009-07-07T00:53:05ZJames Cookjames@lindenlab.com2009-07-07T00:53:05Zurn:sha1:52aeaa32841e7d0b37abab0a2a2540c2be2f16b7
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
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-32009-06-21T08:04:56ZSteven Bennettssteve@lindenlab.com2009-06-21T08:04:56Zurn:sha1:9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8
ignore-dead-branch
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.32009-05-04T17:43:26ZAdam Mossmoss@lindenlab.com2009-05-04T17:43:26Zurn:sha1:cc92525b0df952659102d2e5adcc4140fea7f371
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
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-11652009-01-08T00:05:06ZAaron Brashearsaaronb@lindenlab.com2009-01-08T00:05:06Zurn:sha1:e3cf284388e7c8a4c0755ba9e689f6a6264a5a26merge release@83343 skinning-1-merge@83714 -> release2008-04-01T17:45:04ZSteven Bennettssteve@lindenlab.com2008-04-01T17:45:04Zurn:sha1:941cb9f4124c9ccfd5c845bc94639fa46df12c3d
QAR-424
merge Branch_1-19-0-Viewer -r 78432:78989 -> release2008-02-01T22:10:40ZSteven Bennettssteve@lindenlab.com2008-02-01T22:10:40Zurn:sha1:485c7ee0e2ebc2223c35fbb59a569ed889a1193c
QA'd in QAR-186:
DEV-9179: Commit translated and reviewed strings from 1.19 frozen branch pull
DEV-8792 Place information teleport button hidden behind chat bar.
DEV-9374: Remove "New Account..." and "Preferences" buttons from login screen for 1.19.0
DEV-9411 -- Update required version of Quicktime library to 7.4 for 1.19.0 Viewer
DEV-9430 Viewer auth failed login screen is shown in the loginxui 1.19 viewer on failure to retrieve normal login screen - changed wording of error page
DEV-8537 Chat console appearing underneath status buttons
DEV-9283 Chatbar cant be open while in mouselook
DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9520 Menus and Other items minimise behind onscreen buttons
DEV-9521 Unable to ctrl and click to select in the friends list
DEV-9530 SEC-20 Exploit to force users to teleport to a location on profile open.
DEV-6833 - Mature events icon and checkbox is missing from map legend
Also:
Added vc9 project files (+ minor changes for vc9) (steve)
Modified vc project files to not include the path for flex / bison (steve)
Added marker file deletion to crash logger to stop double reporting. (cube)