summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
AgeCommit message (Collapse)Author
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-25Pull in downstream CHUI code from viewer-developmentsimon
2013-03-19Merge in viewer-beta to get CHUI codeSimon Linden
2013-03-18MAINT-2497 FIX (Viewer) - viewer side change that goes with server side fix ↵callum_linden
- adds direction when you set a TP landing point
2013-03-11Viewer-chui mergeprep
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2012-12-14MAINT-2121 Fixed case where changing other parcel option disables 'Show ↵Maestro Linden
place in search'. Reviewed by Simon.
2012-10-18CHUI-373 : Fix : Refresh panel after setting parcel for saleMerov Linden
2012-08-30CHUI-305: Minor changes after code review. Using templated findChild() ↵Gilbert Gonzales
instead of getChildView(). Also using settings.xml to store common custom variables.
2012-08-29CHUI-305: Problem: The 'resident picker' had multiple parents and due to the ↵Gilbert Gonzales
design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'.
2012-08-17Expanding region flags to 64 bits. Adding region protocol flagsDon Kjer
2012-08-08MAINT-269 FIXED Check if current agent is owner of the parcel before ↵maxim_productengine
enabling "Buy pass"
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-06-29Merge simon/viewmaster-merge for latest maint worksimon@Simon-PC.lindenlab.com
2012-06-25MAINT-30 Estate access lists for groups and residents are blank when "Allow ↵Kelly Washington
public access" is checked. MAINT-1200 Resident names not sorted in About Land (or Estate management) floater's allowed/banned boxes reviewed with Simon
2012-06-22mergeDave Parks
2012-06-15MergeDave Parks
2012-06-14MAINT-442: [PUBLIC]Unable to change parcel restrictions for a scripts-disabledsimon@Simon-PC.lindenlab.com
parcel in a damage-enabled region. Reviewed by Kelly
2012-05-25Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-05-23Removing cruft code that is no longer used.Todd Stinson
2012-05-22MAINT-119 FIXED (PUBLIC]no-transfer textures not searchable via texture picker)Paul ProductEngine
- Implemented Richard's and Leo's spec - Also fixed an issue when applying no-transfer texture for an object using texture picker, creates redundant copies of the texture in the object's content
2012-02-13EXP-1882 FIXED Crashes when invoking avatar picker from mouse look mode.Vadim ProductEngine
Fixing the cases missed in EXP-1879.
2012-01-24merge changes for vmrg-218Oz Linden
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.
2012-01-10STORM-1788 Clarify wording in About Land->Access and tooltips (and similar ↵Jonathan Yap
Estate panel)
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 17:41:05 +0000