summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
AgeCommit message (Collapse)Author
2012-01-17EXP-1768 FIXED (incomplete sentence for translation)Paul ProductEngine
The whole sentence was split to two parts: First pars was in panel.string and the second one in the text box. I combined them both in "allow_label5" text box and also I deleted unnecessary panel.string with the first part of the sentence.
2011-11-11EXP-1544 FIX Remove 'Edit Terrain' from About Land floatercallum
2011-10-28STORM-1105 "Traffic: 0" shown for two cases (traffic actually 0, and waiting ↵Jonathan Yap
for data)
2011-07-25STORM-1220 FIXED Localized sim product name (e.g. "Estate / Full Region") ↵Vadim ProductEngine
everywhere.
2011-07-08ER-910 cleanup: removed a stale comment, tweaked text in About Land dialogsimon@lindenlab.com
Options tab.
2011-07-07Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"simon@lindenlab.com
and muck with the "About Land" Options tab one more time.
2011-07-01ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcelsimon@lindenlab.com
Privacy" changes. Many naming changes for the featureto be "See avatars" instead of "hidden avatars". Also removed the "anyone can edit terrain" checkbox and slammed the value to FALSE.
2011-06-20ER-944: Add feature to control user sounds on a parcel. Added new checkboxessimon@lindenlab.com
to the About Land / Sound tab. Reviewed by Kelly.
2011-06-09ER-910: Parcel Privacy. Rename things in code to reflect feature name ↵Dave SIMmONs
change to "hidden avatars"
2011-05-24ER-914: Disable Parcel Privacy UI in viewer if on older simDave SIMmONs
2011-05-13Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-05Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated ↵brad kittenbrink
a bunch of unnecesary header dependencies.
2011-05-02ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by ↵Dave SIMmONs
Kelly
2011-03-29STORM-1072 FIXED [TRANSLATED BUT IN EN] in "Monde" > "Profil du lieu" > "À ↵Paul ProductEngine
propos des terrains" > "Réglement" : "Estate / Full Region" is in english. - Linked region_type string value with translation in strings.xml. If translation for region_type string is absent set unlocalized version (not MissingString text as usual)
2010-10-12MergeLeyla Farazha
2010-09-27MergeLeyla Farazha
2010-09-29STORM-269 FIXED Added strings for missing land types in strings.xmlSeth ProductEngine
If localized land type name is not found it is displayed as original string to avoid MissingString error.
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