21f3634d29
STORM-1793 Fix dumb syntax error
2012-02-06 18:00:18 -05:00
e328dcf406
EXP-1849 FIXED Privacy settings could be set to default when modifying other preferences before login.
2012-02-06 23:07:41 +02:00
d3cbcc58ef
merge changes for storm-1718
2012-02-06 15:52:58 -05:00
df5b1ed85b
merge changes for storm-1804
2012-02-06 15:51:54 -05:00
5b8bcee234
merge changes for storm-1793
2012-02-06 15:48:17 -05:00
234fe401ec
merge changes for storm-1795
2012-02-06 15:47:08 -05:00
8b29cd05a6
merge changes for storm-1803
2012-02-06 15:45:59 -05:00
c0ede2d2b3
merge changes for storm-1741
2012-02-06 15:43:57 -05:00
ae7d475aeb
SH-2794, resolved merge conflict and corrected logic in LLVertexBuffer::determineUsage() to work the way it used to.
2012-02-06 12:43:23 -08:00
344c46a20c
merge, conflicts in llvertexbuffer.{h,cpp}
2012-02-06 15:08:41 -05:00
041f1c1b03
merge
2012-02-06 14:52:11 -05:00
d0da897b24
tag merge back from viewer-beta
2012-02-06 14:48:09 -05:00
836e5e56ee
Added tag DRTVWR-115_3.2.8-beta2, 3.2.8-beta2 for changeset 987425b1acf4
2012-02-06 14:43:32 -05:00
289d756ea8
increment viewer version to 3.3.0
2012-02-06 10:01:09 -05:00
54bc900c95
Added tag 3.2.9-start for changeset 37dd400ad721
2012-02-06 10:00:15 -05:00
d1b00a324b
made hardware settings floater dependent on preferences floater
2012-02-03 19:16:33 -08:00
8b44dafd8f
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2012-02-03 19:05:04 -08:00
e854db0645
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
...
EXP-1854 FIX Text positioning in mini inspector a couple pixels too low
2012-02-03 19:04:36 -08:00
099ce3cbde
merge changes for vmrg-222
2012-02-03 18:35:46 -05:00
e0b29b67b6
EXP-1853 FIX Misspelled value in llbvhloader.cpp
2012-02-03 14:43:38 -08:00
ecb18174d4
EXP-1845 FIX Media controls cannot be selected or set in Build tools texture tab
2012-02-03 14:37:25 -08:00
a89fbc1d33
EXP-1868 FIX Remove Merchant Outbox from Me menu
...
removed merchant outbox context menu
reviewed by Leslie
2012-02-03 11:14:54 -08:00
a3a69b1eb1
Added tag DRTVWR-114_3.2.8-beta1, 3.2.8-beta1 for changeset 16f8e2915f3f
2012-02-03 14:01:03 -05:00
028d9b3b34
EXP-1868 FIX Remove Merchant Outbox from Me menu
...
reviewed by Leslie
2012-02-03 10:45:14 -08:00
5e367f0d9d
Automated merge with http://hg.secondlife.com/viewer-development
2012-02-03 13:12:27 -05:00
90ba675da4
Escape all strings embedded in TeamCity service messages.
...
TeamCity requires that certain characters (notably "'") must be escaped when
embedded in service messages:
http://confluence.jetbrains.net/display/TCD65/Build+Script+Interaction+with+TeamCity#BuildScriptInteractionwithTeamCity-ServiceMessages
TUT frequently outputs messages containing "'", e.g. from ensure_equals()
failure. We've seen TC output nesting get confused when it fails to process
service messages properly due to parsing unescaped messages.
Along with test<n> number, report test name (from set_test_name()) when
available.
Eliminate horsing around to produce normal output on both std::cout and
possible output file. When output file is specified, use
boost::iostreams::tee_device to do fanout for us.
Improve placement (and possibly reliability) of service messages.
Clean up a startling amount of redundancy in service-message production.
2012-02-03 13:09:20 -05:00
acb1df8b85
STORM-1793 Fix another logic error in getAvatars
2012-02-03 11:48:00 -05:00
f106ef8383
STORM-1793 Fix bad assumption in getAvatars
2012-02-03 09:02:01 -05:00
36aba26615
EXP-1843 WIP Added an option to output avatar rez timing.
...
Use the new "Avatar Rez" debugging tag to see the output.
2012-02-03 11:10:13 +02:00
ca37970a3a
EXP-1840 FIXED (When two inventory windows are open and "properties" are viewed, one window suddenly moves in front of the other window)
...
- Modified method LLFloaterSidePanelContainer::openChildPanel so that it doesn't open floater each time it's called. Otherwise each time opening child panel of already opened floater, openFloater() will reposition the floater.
2012-02-03 08:49:14 +02:00
094b3b8f3d
EXP-1819 FIXED (Location & Favorites bar splitter should be draggable to 200 px on left and 150 px on right. )
...
- Allowed dragging to the left to shrink location to no less than 310 pixels, and to the right to shrink favorites to 185 pixels
2012-02-03 07:43:34 +02:00
c1e47e0aca
EXP-1856 FIX -- Calling cards, library items, 'no transfer' objects can be copied to Merchant outbox via ctrl-v
...
* Viewer now applies the same logic as inventory drag and drop to clipboard
paste operations.
2012-02-02 12:22:00 -08:00
ff10555bd8
Automated merge with bundle:E:\code\viewer-experience+c:\users\richard\appdata\local\temp\thg.trckmy\ssh__richard@hg.lindenlab.com_richard_viewer-experience_ywvwfc.hg
2012-02-02 11:36:27 -08:00
8f1f84212b
EXP-1858 FIX Received Items panel heading in incorrect position
...
didn't account properly for collapsed panels
2012-02-02 11:35:36 -08:00
9721e4f783
Removing a call to llround() per Richard.
2012-02-02 20:45:08 +02:00
8d6665b5c2
Restoring a call to llround() in lllineeditor.cpp mistakenly removed in changeset 0a9ef58e8f7d.
...
By the way, removing a pointless call to llround() in lldraghandle.cpp.
2012-02-02 13:29:24 +02:00
174aa75799
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2012-02-01 16:51:06 -08:00
d32c1c28b4
cleaned up linden_common.h, removing stuff that is mostly unused
2012-02-01 16:39:27 -08:00
7314ac3a37
EXP-1672 FIXED Various fixes to prevent crashes in notifications.
...
- Refactoring of LLToast and LLScreenChannel classes: moved LLToast signals to the private section.
- Modified the screen channel's lists of toasts to store LLHandles instead of pointers and screen channel code to work with toast LLHandles.
2012-02-01 23:44:25 +02:00
5a14a67e06
converted a bunch of narrowing implicit conversions to explicit
2012-02-01 13:03:46 -08:00
34408bed26
merge
2012-02-01 15:43:11 -05:00
b396089906
EXP-1822 FIXED (After deleting an item from inventory and confirming "ok" to delete, focus leaves inventory)
...
-Return focus to the previously focused view
2012-02-01 17:15:22 +02:00
1404ba1ffa
fixed Linux build
2012-02-01 16:39:06 +02:00
178b30601b
fixed layout_stack regression resulting in side toolbars being truncated
2012-01-31 17:52:01 -08:00
c47c31fdbf
EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local Chat
2012-01-31 17:51:43 -08:00
127f6d1405
Fixed up LLVolume memory leak caused by mesh repo thread.
...
Reviewed by Bao.
2012-01-31 16:36:25 -08:00
adefcabd6a
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2012-01-31 15:34:44 -08:00
20b46ef6f6
EXP-1851 FIX Crash when trying to resize the bottom sections
...
more layout logic fixes and added renormalization to fractional sizes to eliminate drift
2012-01-31 15:34:32 -08:00
bb5dc767f7
STORM-1803 Adjust messages in notifications.xml
2012-01-31 16:57:46 -05:00
4f58bd82a3
STORM-1741 Collection of color and skinning issues
...
With help from Jonathan Yap
2012-01-31 13:06:53 -05:00
Jonathan Yap