c0eb697a53
Change LLViewerMedia::isInterestingEnough() to also check selection
...
If the object is in the selection, its interesting. Load its media data
ASAP.
Conceptually reviewed by monroe
2009-12-14 17:39:24 -08:00
a386296855
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-12-14 17:28:04 -08:00
c2f7e88fea
DEV-43872: Change Home URL and Current URL to Home Page and Current Page
2009-12-14 17:27:46 -08:00
2078125f9a
Only do the "lowest interest loadable" calculation if we've already hit the PluginInstancesTotal cap. Otherwise, we always need to load the top media data item.
2009-12-14 16:44:22 -08:00
909a16e520
DEV-43913: tweak positions of play & pause so they look like they are the same button
2009-12-14 16:22:37 -08:00
7a7562724d
follow-up from my last change
2009-12-14 15:47:57 -08:00
b877ed17e8
DEV-42327: Compute controls position & size for HUD objects
...
Review #62
Added facility to get the HUD projection and modelview matrices by refactoring the calls in llviewerdisplay a bit.
2009-12-14 15:41:09 -08:00
38483348ee
Made LLViewerMedia::isInterestingEnough() take the performance manager's priority list list into account.
2009-12-14 15:15:08 -08:00
caaf0173aa
Added EOL to file for Mac/Linux platforms
2009-12-14 14:13:55 -08:00
180daf3ab8
Merge with Tip
2009-12-14 14:10:16 -08:00
894a5006b3
Fix for DEV-44045 "Update text, checkbox & layout changes for Build : Media Settings : Controls tab"
2009-12-14 13:20:23 -08:00
5b6e4577ae
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-12-14 12:04:05 -08:00
da3ca7c5b9
Allow selection of media faces even if there is no impl. We record
...
the target object and use that fact to raise its interest level.
This is mostly a pass-off for monroe to take and run with
2009-12-14 12:03:44 -08:00
962a42a331
Merge
2009-12-14 09:07:07 -08:00
a9e409c707
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-14 11:58:08 -05:00
0300b81414
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-14 16:21:57 +00:00
7b2f4b6169
EXT-3426: Update Place buttons based on state.
...
We now disable the teleport/map buttons when they cannot be used (when
we don't have a global 3D position for the parcel). We also update
this button enable state at the right times.
2009-12-14 16:21:15 +00:00
94a9b1ed0d
EXT-3426: Enable Teleport/Map buttons for all Places.
...
When we open the Places side tray for a parcel, given a UUID, we now
look up the parcel's global 3D position so that the teleport and map
functions work correctly.
2009-12-14 15:53:03 +00:00
b1d4502018
automated merge avp->viewer2.0
2009-12-14 10:46:02 -05:00
aad8d99af2
automated merge viewer2.0->viewer2.0
2009-12-14 10:39:59 -05:00
88b73b1146
For EXT-3264: Missing separators in inventory context menus - restore
...
--HG--
branch : avatar-pipeline
2009-12-14 09:34:42 -05:00
a763409647
EXT-2764 EXT-2766 add and remove help ids to reflect reality
2009-12-13 12:17:55 -05:00
b8ac919d6f
merge
...
--HG--
branch : avatar-pipeline
2009-12-12 15:50:01 -05:00
4019c79a27
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-11 20:58:20 -07:00
b79d694f6d
replace some magic numbers of http status, and fix for DEV-40952/SNOW-208: HTTP GET requests for textures check for http status 203, but should check for 206.
2009-12-11 20:51:06 -07:00
417083068d
EXT-3278: copy & wear in object inventory is now only enabled if we can wear contents
2009-12-11 21:37:36 -05:00
5e4d7ec715
In LLPluginProcessParent, instead of killing the plugin process, terminate it by closing the sockets. This lets it do some cleanup before exiting, instead of just getting shot.
2009-12-11 17:50:59 -08:00
ae8c1d1ea8
For EXT-3264: Missing separators in inventory context menus - restore
...
--HG--
branch : avatar-pipeline
2009-12-11 18:49:29 -05:00
943e1fbe02
Merge
2009-12-11 15:46:41 -08:00
3e75137f26
EXT-3277 "<X> Items Fetched" info on InventoryFloater lost.
...
Background fetches track whether they're being done on MyInventory, Library, or both.
Also did some cosmetic header file cleanup.
2009-12-11 18:13:54 -05:00
6f71bc704a
DEV-40452 (followup) Correct a few more inconsistencies in the 3 new LSL editor tooltips
2009-12-11 14:31:03 -08:00
7ca1bfc78d
fix multiple heads in repo
...
--HG--
branch : avatar-pipeline
2009-12-11 17:29:04 -05:00
9c0d3e4e86
resolving sidepanel conflict
...
--HG--
branch : avatar-pipeline
2009-12-11 13:17:19 -08:00
99590047eb
automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-11 16:01:44 -05:00
d2b72fe018
EXT-3373 : Favorites folder disappears after canceling filter
...
Doing a more robust check to see if folders need to be refreshed.
--HG--
branch : avatar-pipeline
2009-12-11 15:57:41 -05:00
f51bf5d618
Merge
2009-12-11 12:36:46 -08:00
b303dbb086
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-11 20:15:06 +00:00
7c34cd8eb6
EXT-3408: Added support for secondlife:///app/classified SLurls
...
I added a handler for this SLurl type that displays the classifieds
details in the side tray.
In order to do this, you have to open the profile of the classified's
creator first. Which means that I have to ask the server for the
classified's description in order to get the creator id. This is done
with an LLAvatarPropertiesObserver observer. One complication here is
that this observer takes the avatar id as a parameter, but we don't
know that (that's what we're trying to find out) - so I made it
possible to pass in a null avatar id - it's only used to filter out
non-interested observers in the notifyObserver() call.
2009-12-11 20:14:23 +00:00
6245ae0bac
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
2009-12-11 12:10:48 -08:00
bbfb25077b
Fix linux build
2009-12-11 12:10:16 -08:00
5b1c92ebb0
EXT-906 Update inventory properties floater with new permissions layout
2009-12-11 11:24:31 -08:00
1f3a554709
Minor gcc compile fix
...
--HG--
branch : avatar-pipeline
2009-12-11 14:16:46 -05:00
f042f35381
Merge of viewer2 into avp branch
...
--HG--
branch : avatar-pipeline
2009-12-11 13:37:00 -05:00
c74d5c483c
EXT-3317 missing string in appearance editor
...
name string wasn't capitalized so couldn't find the actual label to apply.
capitalizing "Wrinkles" makes the string be found. yay.
Reviewed by Vir
2009-12-11 12:47:36 -05:00
ea3b996143
Automated merge with ssh://nyx@hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-12-11 12:07:49 -05:00
f0da8a7420
Merge media back into viewer 2-0
2009-12-11 09:07:39 -08:00
3089e1a17a
EXT-2718 avatar render cost higher in 2.0 than in 1.23
...
previous fix fixed the double-counting of texture costs. resulting ARC
was ~99 points higher for most avatars. This patch makes the cost shoot
up again, as ARC was improperly computed in 1.23 and before.
This makes the cost for an avatar increase 10 points per prim instead of
per-attachment, which is how we have documented it. Also used constants to
eliminate magic numbers and increased ARC limit from 1024 to 2048.
Will request feedback on change from BSI:STU
Code reviewed by Bigpapi
--HG--
branch : avatar-pipeline
2009-12-11 12:07:35 -05:00
6542ffe2f0
Merge viewer 2-0 into media
2009-12-11 08:49:37 -08:00
eda8634b17
EXT-3394: Remove manual voice gain controls.
...
The new Vivox SDK supports Automatic Gain Control (AGC), so we
shouldn't need to change the local gain level from the default of 50%.
This change sets the initial gain level to 50 (instead of 62) and
removes the local gain sliders from the Sound Preferences floater and
the Voice Controls floater. The latter was not hooked up yet anyway.
2009-12-11 15:06:32 +00:00
6d9fe27a25
merge
...
--HG--
branch : avatar-pipeline
2009-12-11 10:04:46 -05:00
Rick Pasetto