summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterland.cpp
AgeCommit message (Collapse)Author
2013-12-02merge with releaseRichard Linden
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-11-06merge with releaseRichard Linden
2013-10-25Fix release merge issues (included upstream changes not yet in release from ↵Graham Linden
bear)
2013-10-25Merge 3.6.9 ShareStormGraham Linden
2013-10-15merge changes for DRTVWR-336Oz Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-09-23MAINT-3159 FIXED Disable buttons when refreshing ui.Mnikolenko ProductEngine
2013-08-29remove refresh of search attributes from draw method in About Land floater; ↵Oz Linden
does not seem to be needed and slows things down
2013-08-29merge changes for storm-1933Oz Linden
2013-08-19MergeXiaohong Bao
2013-10-23Merge latest viewer-release with FBCsimon
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-07MAINT-2257 : Create ability to limit region/estate and parcel access bysimon
either Piof or Group membership (viewer changes). Using Mnikolenko's patch
2013-06-05merge with viewer-releaseRichard Linden
2013-05-10SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect standard naming conventions for handlers vs. reactors
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-02-23STORM-1933: Certain show in search categories for parcels will not stay selectedAnsariel
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.