summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmgr.cpp
AgeCommit message (Collapse)Author
2010-03-02MergeJames Cook
2010-02-16EXT-5270: Implement "dynamic" controls based on the selected item in Nearby ↵Rick Pasetto
Media Review #112 This change adds controls that change state based on the selection in the nearby media panel. There are basically 3 sets: - Time-based - Web-based ("Normal") - Disabled Again, these change based on what you've got selected in the panel
2010-02-11converted llfloaternearbymedia to llpanelnearbymediarichard
moved from LLTransientDockableFloater model to popup panel model like volume popup
2010-02-11MergeJames Cook
2010-02-05MergeLeyla Farazha
2010-02-05EXT-4252 Streaming Audio lost after TPLeyla Farazha
reviewed by Rick
2010-02-04Converted all gCacheName->getName to getFullName for SLID compatibilityJames Cook
Also eliminated notification "ObjectGiveItemUnknownUser" because the SLURL-based name lookup will always retrieve the user name. Fixed a bug with ObjectGiveItem where the SLURL would be incorrect for a group.
2010-02-03Backed out changeset 83d2ec4d4a5e, a hack that forces you to fall when ↵Vadim Savchuk
entering a parcel with no rights to fly in it. --HG-- branch : product-engine
2010-02-01(EXT-2987) Parcel Characteristics icons aren't refreshedSergei Litovchuk
after changing restrictions - LLViewerParcelMgr refactoring. Changed parcel characteristics accessors to get selected parcel properties. --HG-- branch : product-engine
2010-01-29Partial fix for normal (EXT-4722) Ability to fly in a parcel when flying is ↵Sergei Litovchuk
disabled in the About Land - Added forced flying off when entering a parcel with no rights to fly in it. --HG-- branch : product-engine
2010-01-29Fixed bug EXT-4437 ([BSI] console warning flood when viewing profile) by ↵Vadim Savchuk
suppressing duplicated warnings. --HG-- branch : product-engine
2010-01-29mergeIgor Borovkov
--HG-- branch : product-engine
2010-01-29got rid of lloverlaybar, llmediaremotectrl, llvoiceremotectrl dependencies, ↵Igor Borovkov
updated cmake list --HG-- branch : product-engine
2010-01-28Fixed normal bug (EXT-4610) [BSI] parcel settings icons do not match parcel ↵Sergei Litovchuk
settings - Changed parcel settings behavior to match viewer 1.23. --HG-- branch : product-engine
2010-01-15fix casting error in gooey merge.Tofu Linden
2010-01-15EXT-4133 MissingString(AllEstatesYouOwn) when adding/removing from ↵Leyla Farazha
REGION/ESTATE, Estate tab reviewed by James
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ↵angela
open, movement controlled, etc)
2010-01-05Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy.Tofu Linden
2010-01-05DEV-44775 pref incorrectly named 'AudioSteamingMedia' in many placesTofu Linden
2009-12-11implemented EXT-2323 “Get rid from obsolete notification widgets”;Alexei Arabadji
--HG-- branch : product-engine
2009-12-09Fixed normal bug EXT-3139 (Invalid Region/Parcel name is shown forAndrew Dyukov
intra-region teleports in the back/fwd history). --HG-- branch : product-engine
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-24Removed llnotifications.h from all headers by adding llnotificationsptr.hJames Cook
Fixed many more includes
2009-11-23Initial implementation of parcel property icons and maturity string on nav barJames Cook
Added new LLAgentUI location format, renamed unclear old one Renamed ShowCoordinatesOption to NavBarShowCoordinates Extended LLLocationInputCtrl to show icons. Reviewed with Rick
2009-10-26EXT-1548 - Fix for Crash on restart of a regionSteve Bennetts
2009-10-22EXT-1651 Fix "You cannot close the Buy Land window" error message that ↵James Cook
prevents buying land more than once per login session. Made LLFloaterBuyLandUI destroy itself on close, which cleans up pending currency transactions. Changed LLViewerParcelMgr::deleteBuyInfo() signature because I found it confusing. Reviewed with Richard.
2009-10-02merge of latest viewer/viewer-20Mark Palange (Mani)
2009-09-30DEV-35039 Viewer 2.0 Help System - Viewer DevelopmentAdam Moss
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 ↵brad kittenbrink
merge (r131929). Some minor post-merge cleanups still required.
2009-08-27svn merge -r 129841:129910 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910 svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05 Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
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-13Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api.brad kittenbrink
2009-08-12merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0 Fixes: EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412 Other changes: Movement & Caemra controls work Profile and Me panel refactoring Notification refactoring
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ↵brad kittenbrink
I'll need to rebuild that, plus a couple other minor clenaups.
2009-07-30merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
2009-07-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-07DEV-34720 Mute allJiao Li
DEV-34721 "Streaming Media" checkbox DEV-34723 Mouse sensitivity slider Reviewed by James
2009-06-24Mercurial build: minor tweaks to fix some Mac build errorsNat Goodspeed
2009-06-23A few more merge error fixes.Mark Palange (Mani)
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
Boost.Signals2 like the rest of the event-system-n code.
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-13svn merge -r114093:114412 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge Melinda (coco): 5th and final batch of featurettes. My work here is done.
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-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated