| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  | bar after teleport from another land for sale with 'Moderate' rating)
-       Reason: after teleport, Agent's content rate compares with just teleported Region's content rate, to check whether Agent can buy a Parcel in this Region. But it compares with old Region ones. Because In method 'LLViewerParcelMgr::canAgentBuyParcel' the call of 'LLViewerParcelMgr::getInstance()->getSelectionRegion()' returns last selected parcel. So after teleport this method call will always return old Region.
        Solution: In 'LLViewerParcelMgr::canAgentBuyParcel' determine current Parcel Agent is in, then determine Region using Agent's Parcel information and use actual Region.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/222/
--HG--
branch : product-engine | 
|  | 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 | 
|  | moved from LLTransientDockableFloater model to popup panel model like volume popup | 
|  |  | 
|  | reviewed by Rick | 
|  | entering a parcel with no rights to fly in it.
--HG--
branch : product-engine | 
|  | after changing restrictions
- LLViewerParcelMgr refactoring. Changed parcel characteristics accessors to get selected parcel properties.
--HG--
branch : product-engine | 
|  | disabled in the About Land
- Added forced flying off when entering a parcel with no rights to fly in it.
--HG--
branch : product-engine | 
|  | suppressing duplicated warnings.
--HG--
branch : product-engine | 
|  | --HG--
branch : product-engine | 
|  | updated cmake list
--HG--
branch : product-engine | 
|  | settings
- Changed parcel settings behavior to match viewer 1.23.
--HG--
branch : product-engine | 
|  |  | 
|  | REGION/ESTATE, Estate tab
reviewed by James | 
|  | open, movement controlled, etc) | 
|  |  | 
|  |  | 
|  | --HG--
branch : product-engine | 
|  | intra-region teleports in the back/fwd history).
--HG--
branch : product-engine | 
|  | Cuts number of includes of llnotifications.h from 300+ to 40. | 
|  | Fixed many more includes | 
|  | Added new LLAgentUI location format, renamed unclear old one
Renamed ShowCoordinatesOption to NavBarShowCoordinates
Extended LLLocationInputCtrl to show icons.
Reviewed with Rick | 
|  |  | 
|  | 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. | 
|  |  | 
|  | svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3 | 
|  |  | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 | 
|  | merge (r131929).
Some minor post-merge cleanups still required. | 
|  | 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. | 
|  | 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 | 
|  |  | 
|  | 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 | 
|  | I'll need to rebuild that, plus a couple other minor clenaups. | 
|  | 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 | 
|  | svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8 | 
|  |  | 
|  | DEV-34721  "Streaming Media" checkbox
DEV-34723  Mouse sensitivity slider
Reviewed by James | 
|  |  | 
|  |  | 
|  | Boost.Signals2 like the rest of the event-system-n code. | 
|  | ignore-dead-branch | 
|  | 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 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge | 
|  | 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. | 
|  | svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 | 
|  | svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 .  QAR-1149 -- Final merge of notifications to trunk. | 
|  | dataserver-is-deprecated | 
|  | svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release
svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release
ACTUAL MERGE: svn merge -r 87631:87698  svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release
dataserver-is-deprecated |