ae6eef4b83
merge
2015-01-13 17:36:36 -05:00
d5ab47b1bc
SL-92 WIP - added signal for simulator features received. Use to keep hover floater UI synced with region support for hover.
2015-01-13 17:18:15 -05:00
97a1a92d79
Fix autobuild merge error
2015-01-13 23:17:50 +01:00
eb2f35764e
Merge LL V3.7.14
2015-01-13 23:04:32 +01:00
342c5c500e
Fix phototools camera floater as well...
2015-01-13 21:49:47 +01:00
0cbbee6bb6
Fix mouselook icon missing on camera floater
2015-01-13 21:45:01 +01:00
7973d66a60
Merge viewer-release and become 3.7.25
2015-01-13 21:15:08 +02:00
a676969b94
FIRE-13902: [OpenSim] MiniMap Texture incorrect for variable size opensim regions; fix by Lirusaito Faers, released under LGPL
2015-01-13 19:32:39 +01:00
3a9c6e5add
Comment out LLManipScale::renderEdges for now due to overeager compiler complaining about array index out of bounds
2015-01-13 19:19:16 +01:00
4d4bd28c9d
Merge.
2015-01-13 07:28:45 -05:00
7cc00567dc
Build fix.
2015-01-13 07:28:03 -05:00
f92aedd86e
More cURL API fixes... (Fix for LLSyntaxIdLSL will be merged from upstream in a later merge)
2015-01-13 12:05:19 +01:00
94ec054a44
Clean up cmake list
2015-01-13 11:45:38 +01:00
0d80b8f758
Fix crash when trying to open a script while FSFixCursorPosition is set to TRUE
2015-01-13 11:39:33 +01:00
7ced07cf32
Add color picker for constants we receive from SL
2015-01-13 09:29:40 +01:00
9255082123
Compile fix for previous commit
2015-01-13 09:19:15 +01:00
13c35f19ef
GPU table download bugfix. Process the headers to pick up and set mLastModified.
2015-01-12 20:15:43 -05:00
0bb7b31760
fsdata bug fix. Process headers before processing the body that needs mLastModified to be set from the headers.
2015-01-12 20:08:52 -05:00
846150b937
FIRE-15368: Don't include floater in screenshot update for abuse report floater
2015-01-12 21:56:01 +01:00
caa3e5acd4
Fix the tools floater layout
2015-01-12 21:13:17 +01:00
2eeda3bf1b
fix typo in last commit
2015-01-12 12:12:12 -08:00
f60da79c96
Clean up FS tags and add last few releases
2015-01-12 12:09:40 -08:00
fad02b30ce
increment viewer version to 3.7.25
2015-01-12 15:08:48 -05:00
0cef46ff54
Added tag 3.7.24-release for changeset d3d0101e980e
2015-01-12 15:08:48 -05:00
094b0582b7
Remove some old orphaned settings from old contact sets floater
2015-01-12 20:49:20 +01:00
1f04761eaf
Replace deprecated logging macros
2015-01-12 20:33:16 +01:00
88c26487c5
MAINT-2560 reverted
2015-01-12 12:38:06 +02:00
4b33a395ba
FIX MAINT-2701 restore 10 translated strings that were lost during an earlier dev merge (see Jira screenshots for details)
2015-01-09 16:36:55 -08:00
5efde2a445
FIRE-11745: Add particles performance fix for testing (re-add changes that got lost in one of LL's merges)
2015-01-09 00:47:52 +01:00
24ed25883d
More hacking on the group notice attachments - Who at LL had the idea to route IOR_ACCEPT through IOR_SHOW???
2015-01-08 22:58:19 +01:00
01e62e7336
Fix action on inventory offers when forcing a respond without user action
2015-01-08 22:10:02 +01:00
ee63c30ea7
SL-92 WIP - remove hover for self if we receive an appearance with no hover specified
2015-01-08 10:35:36 -05:00
f2d2e9d168
merge
2015-01-07 17:15:15 -05:00
58d6562e60
Blocklist sometimes shows "(waiting)" as avatar name when blocking particle owners
2015-01-07 16:51:27 +01:00
27d75d6a62
FIRE-15342: Avatar icons are shown in V3 chat history under RLVa ShowNames restriction
2015-01-07 14:30:53 +01:00
e0f29af442
Updated German translation
2015-01-07 14:13:03 +01:00
488f737fdf
Rename fs_floater_vram_usage.xml to floater_fs_vram_usage.xml so it can actually be previewed in the XUI preview tool
2015-01-07 14:10:10 +01:00
0c5678814e
FIRE-3234 / FIRE-3832: Add silent agent inventory offer actions to legacy accept messages & separate show <-> accept
...
This commit addresses several issues with inventory offers:
1. When enabling legacy accept messages, the notification now allows to perform
silent actions without notifying the sender. This has been implemented only
for legacy style accept messages, because the V3-way will notify the sender
automatically if the offer is received, so that it doesn't make any sense to
add this feature here.
2. Inventory offers from agents now allows to choose between either accepting
the offer OR accepting and showing. This is independent from the ShowNewInventory
debug setting ("Automatically show new notecards, textures, landmarks after
accepting"). However, due to the way inventory offers from groups or inworld
objects work, there is no separation and accepting offers from these sources
will still either open automatically or not, depending on the ShowNewInventory
setting.
3. The debug setting ShowOfferedInventory that was exposed nowhere and therefore
always TRUE has been made obsolete. Since ShowOfferedInventory is tied to
inventory offers from agents, there is no need for this setting anymore, as
inventory offers from agents now show separate options for showing or just
accepting. If an inventory offers is shown depends on either the user's
choice per agent inventory offer or the ShowNewInventory debug setting.
4. Removed the check for ShowNewInventory in check_offer_throttle() as it will
be called by open_inventory_offer(). Instead, check for ShowNewInventory
before actually trying to open an inventory offer.
5. Fix the inventory panel still jumping to the new item despite the debug
setting ShowInInventory has been set to FALSE. The new item will now only be
shown in inventory, if ShowInInventory is TRUE. If the inventory panel is
closed, it will be opened.
2015-01-07 13:23:22 +01:00
bb0329d012
Add debug floater to show how much texture memory objects in view use (per object).
2015-01-07 01:34:44 +01:00
82d306084b
Refactor some stuff in LSL preprocessor
2015-01-06 20:11:15 +01:00
07812106ed
Moved mHoverOffset to LLCharacter so it's accessible inside animations. Apply offset when constrained to ground.
2015-01-05 18:13:33 -05:00
62ab044b1a
SL-92 WIP - changed setting name to AvatarHoverOffsetZ
2015-01-05 15:34:40 -05:00
57363fdfd6
SL-92 WIP - More consistent enforcement of min/max hover values. Setting is stored as a per-account F32 value.
2015-01-05 14:13:19 -05:00
655c2bd337
merge
2014-12-22 15:02:25 -05:00
79a89f5d92
SL-92 WIP - moving AvatarPosFinalOffset to per-account settings
2014-12-22 11:18:58 -05:00
553b7ede72
Moved AvatarPosFinalOffset to per-account settings file
2014-12-22 11:14:15 -05:00
d33bb1fe67
merge
2014-12-22 10:06:45 -05:00
277e3268cf
Merge viewer-release and become 3.7.24
2014-12-19 10:52:24 -08:00
1333e9332a
merge changes for 3.7.23
2014-12-19 09:09:20 -05:00
ff64d73691
Added tag 3.7.23-release for changeset 3be800e1afad
2014-12-18 14:02:41 -05:00
Brad Payne (Vir Linden)