96438194cd
merge
2013-02-25 18:19:28 -05:00
9233f08ddb
SH-3892 SH-3896 SUN-28 FIX add to outfit behaves like replace outfit
...
Conversion away from retry mechanism missed one case which was not supporting
the 'add' operation properly. Changed code to use linkAll instead, as it
did previously.
2013-02-25 18:19:08 -05:00
1bea820db4
64 bit compile fix.
2013-02-25 22:38:46 +01:00
39694738bd
Re-Apply fix for newer GLIB versions.
2013-02-25 22:38:33 +01:00
a2abb8c5cf
Re-Add FindLLQtWebkit.cmake, needed for standalone.
2013-02-25 22:37:47 +01:00
38cbe8bd89
FIRE-9259; Update colladadom.
2013-02-25 22:36:27 +01:00
c214c19c50
Updated Polish translation after Sunshine merge
2013-02-25 19:15:07 +01:00
ee85bbf35e
FIRE-9318: Reset cursor to crosshair when leaving build tools
2013-02-25 18:05:18 +01:00
d49085a340
AvatarOffsetZ is a per user setting
2013-02-25 09:19:54 -07:00
5b9b4ede02
Fixed merge issues in settings.xml
2013-02-25 12:54:24 +01:00
0d7439b96b
Merge Firestorm LGPL
2013-02-25 12:29:13 +01:00
06a87463c1
Merge
2013-02-25 11:38:39 +01:00
97daf78bc6
Backed out changeset: fb595390a15d: Comment was mistakenly re-added
2013-02-25 11:38:10 +01:00
1e9293e278
Removed duplicated context menu items
2013-02-25 11:29:02 +01:00
4dbc52b930
Re-added some informative comment in textures.xml
2013-02-25 11:27:02 +01:00
c6dba43186
Fixed merge issues in menu_viewer.xml
2013-02-25 11:25:36 +01:00
fdee7923f4
Re-added stuff gone missing in RLVa merge for option to display group chats, IM sessions and nearby chat always in uppercase
2013-02-25 11:17:03 +01:00
1192f98e99
Some simplifications for the LSL bridge in llviewermessage.cpp
2013-02-25 11:10:55 +01:00
45a1cf9f17
Reinstate option to mark nameless objects as such
2013-02-25 11:09:08 +01:00
4db8c3f43d
Changed some commenting in lltoolpie.cpp to match style guides
2013-02-25 10:50:16 +01:00
7c9abf6fc7
Reinstate group titles in avatar hovertips
2013-02-25 10:49:48 +01:00
82d5828a6f
Restore restoreToWorld
2013-02-25 00:56:02 -07:00
056e0c00ef
restore nicky's Intel HD rainbow UI fix
2013-02-24 19:57:18 -08:00
a873cccc29
Fix merge error in llchathistory.cpp
2013-02-24 19:31:48 -08:00
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
da04d1105a
FIRE-9326: Bridge shows as worn on an invalid attach point in script info floater again
2013-02-24 13:25:15 +01:00
98b8e785c3
Updated Polish translation
2013-02-24 02:31:55 +01:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
66ac7f0603
FIRE-9318: Added option for pie/context menus in mouselook mode (ALT + right mouse button)
2013-02-23 19:55:36 +01:00
42cd276e2a
Updated Polish translation, Move&View panel in Preferences
2013-02-23 08:31:04 +01:00
d3a091bb68
Finish merge with LL
2013-02-22 21:30:25 -08:00
f138120086
FIRE-7773: Corrected parcel category for search; "Any" is apparently only valid for searches but not as parcel category
2013-02-23 02:22:41 +01:00
42be7a8490
Fixed German translation of object properties floater
2013-02-22 22:10:31 +01:00
f0d8883440
Updated German Move & View preferences
2013-02-22 21:29:38 +01:00
65a35876d5
FIRE-5359: Wire up existing FSLeaveMouselookOnFocus setting in Move & View preferences
2013-02-22 21:29:25 +01:00
0b8d633949
FIRE-9317: Volume control panel malformed in Vintage skin
2013-02-22 19:56:11 +01:00
4d6b76f677
Make LLNearbyChatBarListener respect FSPlayChatAnimation setting
2013-02-22 12:26:58 +01:00
756ab4cad5
SH-3864 FIX Closing the Inventory window exits outfit editing.
...
cleaned up logic when closing floatersidepanels
2013-02-21 16:50:11 -08:00
a3ff9494be
Reverted RenderSSAOEffect back to original x = 0.8 to match SSAO effect before Tofu's tweak
2013-02-21 20:07:25 +01:00
e409ce087b
Fixed ambient occlusion rendering for class 2+ hardware
2013-02-21 20:05:45 +01:00
4ca89ec1e3
FIRE-6081: Fix for opening a SLURL in a webbrowser opens a second instance
2013-02-21 13:54:48 +01:00
3aad568616
Expose handleSetShaderChanged() in llviewercontrol and wire up in quickprefs to avoid code duplication
2013-02-21 11:57:29 +01:00
73f18b4317
Spanish translation update
2013-02-21 00:09:03 +01:00
0321ec417b
Reduce sun shiny in SSR
2013-02-20 23:59:05 +01:00
a80c18f036
Updated Tofu Buzzard's improved DoF
2013-02-20 23:40:29 +01:00
591957ce34
Re-applied Tofu Buzzard's SSR with faster SSAO; Option to disable feature from NiranV Dean
2013-02-20 23:23:06 +01:00
7e528a0bb0
Backed out changeset: a5e3c6daa768
2013-02-20 22:17:45 +01:00
31fea58827
Allow to play a preview of UI sound regardless of its on/off state
2013-02-20 21:02:26 +01:00
4101c43f5f
Merged with viewer-sunshine tip (Revision 87a6fc812214)
...
--HG--
branch : RLVa
2013-02-20 19:25:10 +01:00
b6f814af25
SH-3891 WIP - separate first-time rezzing stats from subsequent state changes
2013-02-20 13:24:58 -05:00
Nyx Linden