summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.cpp
AgeCommit message (Collapse)Author
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-20changed buildPanel/buildFloater to member functions buildFromFileRichard Nelson
streamlined LLUICtrlFactory's interface
2010-08-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
2010-08-16cleaned up LLUICtrlFactory...Richard Nelson
removed redundant functionality moved buildPanel to LLPanel
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-30converted static callbacks to member functions and deprecated ↵Richard Nelson
LLPanel::child*() methods
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-01Automated MergeRoxie Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-01-27CID-200Tofu Linden
Checker: RESOURCE_LEAK Function: LLPanelEstateInfo::onKickUserCommit(const std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char>>, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char>>>> &, std::vector<LLUUID, std::allocator<LLUUID>>&) File: /indra/newview/llfloaterregioninfo.cpp we don't use this structure, all the way back to 1.23
2010-01-26CID-395 Checker: UNINIT_CTORTofu Linden
Function: LLPanelEstateCovenant::LLPanelEstateCovenant() File: /indra/newview/llfloaterregioninfo.cpp
2010-01-15EXT-4133 MissingString(AllEstatesYouOwn) when adding/removing from ↵Leyla Farazha
REGION/ESTATE, Estate tab reviewed by James
2010-01-11EXT-2373 Viewer crashes if open Region/Estate floater after logging outLeyla Farazha
reviewed by Richard
2009-12-28implemented minor task EXT-3454 Code improvements: Replace old-style calback ↵Denis Serdjuk
with boost::function in the LLFloaterAvatarPicker --HG-- branch : product-engine
2009-12-15Merge from default branch.Vadim Savchuk
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs remote change) by removing them. --HG-- branch : product-engine
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-11Merge from default branch.Vadim Savchuk
--HG-- branch : product-engine
2009-12-11implemented EXT-2323 “Get rid from obsolete notification widgets”;Alexei Arabadji
--HG-- branch : product-engine
2009-12-10DEV-28327 Remove ELAR email field from clientSoft Linden
2010-02-25automated merge from trunkRoxie Linden
2010-02-25automated mergeRoxie Linden
2010-02-24Automated mergeRoxie Linden
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
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.
2009-11-03mergedLynx Linden
2009-11-03DEV-39999: Removed all legacy help buttons and notifications from theLynx Linden
code. All help should now go through the new help server, via the Help Browser floater. There should no longer be any custom "?" buttons in the UI - all <button> and <notification> XUI references relating to custom help buttons have been expunged. (I previously extracted all of the help strings from notifications.xml and passed these to the doc team to include in the help server pages.) I have checked that none of the XUI elements that are removed here are still referenced by any C++ code. I've also confirmed that there are no new notifications removed that I have not already passed on to the doc team. And I've also done a pass through the UI to make sure that all of the floaters still look as they should. Finally, I've confirmed that the new help system for floaters and side panels still works. 2,276 lines deleted - 0 lines added.
2009-11-02 EXT-1738 [BSI] Manage Telehub... in Region/Estate floater silently fails ↵angela
when clicked
2009-10-22EXT-1654 - Attempt to fix crash on close by cleaning up some callbacksSteve Bennetts
Reviewed by Richard
2009-10-14EXT-1393 "none" does not appear in object group listLeyla Farazha
EXT-1479 I18N: string in /en/widgets/location_input.xml wont honor its translation and made tabs height customizable reviewed by Richard
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new ↵James Cook
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming. Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-08-26svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3 EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-04svn merge -r 128442:129343 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
merge -r119443 - basic slurl handling ignore dead branch
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to ↵James Cook
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-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
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
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-03-20svn merge -r113004:115000 ↵Dave Simmons
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-05svn merge -r106715:HEAD ↵Kent Quirk
svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2008-10-20Merge 98702-99587 viewer_1-21 -> release Merging changes made between 1.21 ↵Mark Palange
RC5 secu-fix to 1.21.6 release.
2008-10-07svn merge -r98039:98711 ↵Kyle Ambroff
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release Merging various security fixes from Branch_1-24-Server. Related to RequestXfer exploit: * DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id. * DEV-21767: Migrate RequestXfer to TCP-only * DEV-21765: Fix RequestXfer traversal exploit * DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities Various fixes: * fix for VFS memory corruption in llvfs. * Bump server version to 1.24.9. Landstore fixes: * Passing locale to fulfill-order-item from region reservation fulfillment.
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 00:30:39 +0000