summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
AgeCommit message (Collapse)Author
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
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-16moved buildFloater out of lluictrlfactory to llfloater.cppRichard Nelson
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-04deprecated ADD_SORTED due to n^2 behavior, set the sort order on the scroll ↵Richard Nelson
list instead
2010-07-30Merge with dessie/viewer-releaseLeyla Farazha
2010-07-30mergeRichard Nelson
2010-07-30converted static callbacks to member functions and deprecated ↵Richard Nelson
LLPanel::child*() methods
2010-07-20EXT-7654 FIX About Land Floater> Icons missingRichard Nelson
2010-07-19Merge with dessie/viewer-releaseLeyla Farazha
2010-07-09EXT-8296 FIXED Format currency properly in tooltips and the about land window.Aimee Linden
2010-07-06Merge from dessie/viewer-releaseLeyla Farazha
2010-06-24EXT-7046 FIX User profile using wrong placeholder/generic profile pic artRichard Linden
2010-06-22EXT-7654 FIX "AddText" didn't create image segment now, use appendImageSegmentYuri Chebotarev
reviewed by Richard Nelson, Vadim Savchuk at https://codereview.productengine.com/secondlife/r/616/ --HG-- branch : product-engine
2010-06-03mergeRichard Linden
2010-06-02EXT-7314 FIXED Localized \"Estate / Full Region\" and \"Mainland / Full ↵Paul Guslisty
Region\" strings - Added hardcoded \"Estate / Full Region\" and \"Mainland / Full Region\" to the strings.xml Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/483/ --HG-- branch : product-engine
2010-05-28changing notifications from "inspect" slurls to "completename" slurlsLeyla Farazha
2010-05-25MergeLeyla Farazha
2010-05-25reverting debug state for sell land buttonLeyla Farazha
2010-05-25LLFloaterAvatarPicker now uses LLAvatarNamesLeyla Farazha
reviewed by James
2010-05-24mergeRichard Nelson
2010-05-21Rename LLAvatarName::getNameAndSLID() to getCompleteName()James Cook
Discussed with Leyla/Richard
2010-05-19Land display name updatesLeyla Farazha
reviewed by James
2010-05-19EXT-7320 FIXED Moved date time stamp template to localized xml.Alexei Arabadji
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/406/ --HG-- branch : product-engine
2010-05-13Fix build errors introduced in last mergeJames Cook
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-04-07Automated mergeRoxie Linden
2010-04-07Re-insert backed out SLE checkin so we can fix itRoxie Linden
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-06Fixed normal bug EXT-6464 (Buy pass from popup menu doesn't work).Andrew Dyukov
- The bug was caused by deselection of parcel(because of zero ref count to parcel selection) after appearance of alert with ok/cancel. Added setting pointer to this selection before notification appearance and nullifying pointer it after user chooses ok or cancel. Nullifying will always take place because alert is modal, so there is no chance that LLPanelLandGeneral::cbBuyPass() won't be called. Reviewed by Mike at https://codereview.productengine.com/secondlife/r/180/ --HG-- branch : product-engine
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01Automated MergeRoxie Linden
2010-03-30Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-03-29Merge latest viewer-hotfix, approximately equal to Viewer 2.0 finalJames Cook
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-03-26Fixed bug EXT-6268 (Group spawns Resident inspector when called from About ↵Vadim Savchuk
Land > Objects for group deeded object) Reason: groups were added to the list as avatars, which led to invoking incorrect inspector on hover. Also added a fix for potential crash on hovering name list items. Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/110/ --HG-- branch : product-engine
2010-03-16Automated merge from viewer/viewer-2-0Roxie Linden
2010-03-12fixed EXT-3607 (Cancelling a Land Sale to Specific Person Allows Land to be ↵Igor Borovkov
Set For Sale to Anyone Briefly) added additional check so that "for sale to anyone" text is shown only when a parcel is on sale reviewed by Richard at https://codereview.productengine.com/secondlife/r/4/ --HG-- branch : product-engine
2010-03-09Implemented nice-to have sub-task EXT-4706 (Add maturity icons to About Land).Andrew Dyukov
- Added maturity icons to Options and Access tabs. - Created auxiliary local class to get full access to checkboxes' textboxes. --HG-- branch : product-engine
2010-03-08automated mergeRoxie Linden
2010-03-06Fixed linux buildAndrew Dyukov
--HG-- branch : product-engine
2010-03-06Partially implemented nice-to have sub-task EXT-4706 (Add maturity icons to ↵Andrew Dyukov
About Land). - Added maturity icons to General and Covenant tabs. --HG-- branch : product-engine
2010-02-11MergeJames Cook
2010-02-05EXT-5025 - Tooltips block mouse clicksrichard
EXT-4547 [BSI] it is possible to highlight multiple layers of chat EXT-3844 Mouse wheel camera zoom is not reflected on View popup slider EXT-3103 Add an option to restrict entering non-ascii symbols in text editor. reviewed by Leyla
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 00:19:33 +0000