dd9263d017
Automated merge with http://hg.secondlife.com/viewer-development
2011-12-08 11:02:00 -08:00
f54caff1e4
merge changes for storm-591
2011-12-06 13:52:26 -05:00
3193170850
STORM-591 Made change per code review request: disable audio when teleport progress bar is present
...
Added code to start counting the fade in time on login when STATE_STARTED is set
2011-12-05 05:01:38 -05:00
a3ab390930
simple code cleanup
2011-11-28 14:35:17 -08:00
a4cb08ae5d
STORM-591 Trivial code cleanup
2011-11-23 08:42:42 -05:00
57b8da6b49
STORM-591 Remove dead line of code to fix mac/linux compile error.
2011-11-11 12:22:48 -05:00
4cdf396125
STORM-591 As a music fan, I want audio to fade in gently so my immersion is increased
...
Co-written with Robin Cornelius
2011-10-28 17:48:24 -04:00
8b0d63f343
STORM-1105 "Traffic: 0" shown for two cases (traffic actually 0, and waiting for data)
2011-10-28 07:27:54 -04:00
ecafe4d8ab
fix more DOS line endings
2011-05-20 17:19:03 -04:00
f7a01d7b33
Merge.
2011-05-12 17:08:20 -07:00
56e471c399
ER-480 Viewer work for abandoned land.
...
* Support group members with the right powers buying land set for sale to a group
* Add dialogs for abandoned land related notifications.
2011-05-10 08:40:00 -07:00
dbc92691a6
Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies.
2011-05-05 17:13:52 -07:00
774405e92b
Cleanup of headless client (was: DisableRendering mode)
...
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode. This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
50d21a75a7
merge
2010-11-15 15:52:54 -08:00
de11ebefe9
EXP-359 WIP Disable MOAP
...
fixed AudioStreamingMusic and AudioStreamingMedia so they are independent
this way we can keep audio on but disable html content
2010-10-29 16:50:09 -07:00
092e595b25
EXP-172 FIXED Property lines flash on and off when right clicking on land in Skylight viewer
2010-10-11 12:31:00 -07:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
bc7837a697
notification fixes
2010-06-02 11:23:02 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
aade775220
Fixed normal bug EXT-6624 ('Land for sale' icon isn't showed in Navigation 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
2010-04-13 08:44:34 +03:00
fe8d015851
Merge
2010-03-02 14:06:23 -08:00
0e234edcc6
EXT-5270: Implement "dynamic" controls based on the selected item in Nearby 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-16 15:42:33 -08:00
6c5b984bf6
converted llfloaternearbymedia to llpanelnearbymedia
...
moved from LLTransientDockableFloater model to popup panel model like volume popup
2010-02-11 18:06:25 -08:00
9dd7924b19
Merge
2010-02-11 10:09:23 -08:00
91b2ff00ae
Merge
2010-02-05 16:47:38 -08:00
124c535989
EXT-4252 Streaming Audio lost after TP
...
reviewed by Rick
2010-02-05 16:46:26 -08:00
c0b7c93c18
Converted all gCacheName->getName to getFullName for SLID compatibility
...
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-04 20:38:40 -08:00
917841120f
Backed out changeset 83d2ec4d4a5e, a hack that forces you to fall when entering a parcel with no rights to fly in it.
...
--HG--
branch : product-engine
2010-02-03 21:20:37 +02:00
a359db96eb
(EXT-2987) Parcel Characteristics icons aren't refreshed
...
after changing restrictions
- LLViewerParcelMgr refactoring. Changed parcel characteristics accessors to get selected parcel properties.
--HG--
branch : product-engine
2010-02-01 16:57:34 +02:00
3e76862aaa
Partial fix for normal (EXT-4722) Ability to fly in a parcel when flying is 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-29 20:43:55 +02:00
ea7915c2ae
Fixed bug EXT-4437 ([BSI] console warning flood when viewing profile) by suppressing duplicated warnings.
...
--HG--
branch : product-engine
2010-01-29 19:52:52 +02:00
bed3948c4f
merge
...
--HG--
branch : product-engine
2010-01-29 15:58:36 +02:00
ac0fb461f6
got rid of lloverlaybar, llmediaremotectrl, llvoiceremotectrl dependencies, updated cmake list
...
--HG--
branch : product-engine
2010-01-29 14:42:57 +02:00
8f89681e06
Fixed normal bug (EXT-4610) [BSI] parcel settings icons do not match parcel settings
...
- Changed parcel settings behavior to match viewer 1.23.
--HG--
branch : product-engine
2010-01-28 20:06:57 +02:00
1c08238c4f
fix casting error in gooey merge.
2010-01-15 15:02:11 -08:00
56af8f1639
EXT-4133 MissingString(AllEstatesYouOwn) when adding/removing from REGION/ESTATE, Estate tab
...
reviewed by James
2010-01-15 13:33:23 -08:00
433eb89473
EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc)
2010-01-14 09:38:46 +08:00
0c91cfc49c
Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy.
2010-01-05 19:04:45 -08:00
5836902ba0
DEV-44775 pref incorrectly named 'AudioSteamingMedia' in many places
2010-01-05 13:37:37 -08:00
4fc7b91a79
implemented EXT-2323 “Get rid from obsolete notification widgets”;
...
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
a2e06d2c96
Fixed normal bug EXT-3139 (Invalid Region/Parcel name is shown for
...
intra-region teleports in the back/fwd history).
--HG--
branch : product-engine
2009-12-09 16:47:26 +02:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
0e351bedb6
Removed llnotifications.h from all headers by adding llnotificationsptr.h
...
Fixed many more includes
2009-11-24 22:55:56 -08:00
347562844d
Initial implementation of parcel property icons and maturity string on nav bar
...
Added new LLAgentUI location format, renamed unclear old one
Renamed ShowCoordinatesOption to NavBarShowCoordinates
Extended LLLocationInputCtrl to show icons.
Reviewed with Rick
2009-11-23 14:23:51 -08:00
6c03d32e0d
EXT-1548 - Fix for Crash on restart of a region
2009-10-26 20:03:39 -07:00
a464d46970
EXT-1651 Fix "You cannot close the Buy Land window" error message that 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-22 12:15:53 -07:00
4d53e235c2
merge of latest viewer/viewer-20
2009-10-02 10:35:42 -07:00
feabeb4965
DEV-35039 Viewer 2.0 Help System - Viewer Development
...
svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3
2009-09-30 17:46:31 +00:00
bb1d4592bd
Merged latest viewer/viewer-20 into login-api.
2009-09-18 15:22:25 -04:00
Richard Linden