Commit Graph

144 Commits (96bb17f20bbcdc595f3a615a3129e134595b3a4a)

Author SHA1 Message Date
Rider Linden 96bb17f20b Merge 2015-08-25 11:40:36 -07:00
Rider Linden 9f2302bdff Merge 2015-07-01 08:47:50 -07:00
Oz Linden 949942c730 merge changes for 3.7.29-release 2015-06-08 16:33:02 -04:00
andreykproductengine 2684c53690 Merge from viewer-relese and become version 3.8.1 2015-07-02 14:50:23 +03:00
Rider Linden 5fbd84a210 Parcel Media and Viewer Parcel Mgr to generic coroutines. 2015-05-18 14:15:51 -07:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
simon a219cf1c98 Merge viewer-release 2015-04-15 15:07:13 -07:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
andreykproductengine 00f18efe75 MAINT-5063 FIXED SLurl display text shows name of parcel in adjacent region when mousing over parcel after region crossing 2015-04-08 17:05:47 +03:00
Nat Goodspeed b5324afb6f Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2015-02-24 21:02:12 -05:00
Oz Linden 905431cf60 merge changes for 3.7.25-release 2015-02-24 15:48:28 -05:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
andreykproductengine 94ac006435 MAINT-4576 FIXED Damage Icon always displays regardless of land setting. 2014-10-15 19:34:13 +03:00
dolphin f9113c286f Merge 2014-10-09 16:10:00 -07:00
andreykproductengine 7615008efa MAINT-4415 FIXED Speak button does not become enabled after enabling voice on parcel, if voice was disabled upon parcel entry 2014-09-11 17:31:15 +03:00
Mnikolenko ProductEngine 190f66ab78 MAINT-875 FIXED Display notification if user is not allowed to terraform hovered parcel. 2014-06-24 11:37:55 +03:00
dolphin 48fece4473 Merge with 3.7.7-release 2014-05-07 11:14:26 -07:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
dolphin 155399cb71 parcel experience lists can be manipulated through the ParcelAccessListUpdate
message
2014-05-01 13:56:45 -07:00
andreykproductengine 5a76ebc069 MAINT-1805 FIXED "Back" button doesn't teleport user to correct location after performing several teleports to a different locations
Agent position gets reseted frequently while not all varibles are uptadet,
as result it is not reliable for inter-region teleportation.
Changed to value from message.
2014-03-21 22:20:59 +02:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Oz Linden 6bd777214c add callbacks to LLAgent for Region and Parcel changes 2013-11-18 19:05:34 -05:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 11d12f1a99 Merge from viewer-beta 2013-02-13 11:30:36 -05:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Kelly Washington da9442b323 MAINT-2277 Yellow "fence" (selection) of the parcel doesn't update after selecting the other parcel
* Removed bogus check on matching parcel data coming in.
2013-01-24 09:45:31 -08:00
Kelly Washington 4cbef6d928 MAINT-2209 Parcel name not updating after teleport 2013-01-10 09:46:41 -08:00
Kelly Washington fe04921c21 MAINT-1601 Land remains for sale after purchasing for group.
reviewed with Simon
2012-09-21 13:32:25 -07:00
Brad Payne (Vir Linden) 48d9dc9a8e merge 2012-08-22 15:49:38 -04:00
Don Kjer 64d9705ae2 Expanding region flags to 64 bits. Adding region protocol flags 2012-08-17 03:56:38 +00:00
Oz Linden a7d8b42509 merge up to latest viewer-development 2012-08-16 08:52:26 -04:00
davep@spiral.lindenlab.com b9e650a3a1 MAINT-113 Fix for flashing property lines when selecting objects. 2012-08-09 11:47:14 -07:00
Oz Linden df93749819 merge up to latest viewer-development 2012-07-31 14:55:15 -04:00
Jonathan Yap 502e89971f STORM-1812 Tweak how music is restarted for teleport within a parcel 2012-05-14 13:20:06 -04:00
Oz Linden 5b80b00dcd storm-1843: remove unused ParcelMediaURLFilter capability 2012-04-16 22:01:27 -04:00
Jonathan Yap 1daac72722 STORM-1812 Music stream does not always restart after teleporting 2012-02-15 08:05:28 -05:00
Richard Linden dd9263d017 Automated merge with http://hg.secondlife.com/viewer-development 2011-12-08 11:02:00 -08:00
Oz Linden f54caff1e4 merge changes for storm-591 2011-12-06 13:52:26 -05:00
Jonathan Yap 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
Richard Linden a3ab390930 simple code cleanup 2011-11-28 14:35:17 -08:00
Jonathan Yap a4cb08ae5d STORM-591 Trivial code cleanup 2011-11-23 08:42:42 -05:00
Jonathan Yap 57b8da6b49 STORM-591 Remove dead line of code to fix mac/linux compile error. 2011-11-11 12:22:48 -05:00
Jonathan Yap 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
Jonathan Yap 8b0d63f343 STORM-1105 "Traffic: 0" shown for two cases (traffic actually 0, and waiting for data) 2011-10-28 07:27:54 -04:00
Oz Linden ecafe4d8ab fix more DOS line endings 2011-05-20 17:19:03 -04:00
brad kittenbrink f7a01d7b33 Merge. 2011-05-12 17:08:20 -07:00
Kelly Washington 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