6fed3bed60
Merge from viewer-development
2012-01-04 15:42:30 -08:00
7026c80d51
reconciled .hgtags
2012-01-04 17:49:24 -05:00
b99dfa7d46
Added tag DRTVWR-107_3.2.5-beta2, 3.2.5-beta2 for changeset 65a2c1c8d855
2012-01-04 17:42:40 -05:00
e326b1e0fa
Added tag DRTVWR-106_3.2.5-beta1, 3.2.5-beta1 for changeset 3d2d5d244c63
2012-01-04 17:41:54 -05:00
1c4474f894
Merge from viewer-experience
2012-01-04 14:06:36 -08:00
912833bafa
EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders
...
* Updated drag and drop to correctly handle moving to and from outbox as opposed to within the outbox when dealing with
folder and item count limitations related to depth and total folder count.
2012-01-04 14:04:32 -08:00
4405910caa
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2012-01-04 14:15:05 -07:00
94ad019ce3
fix for SH-2823 and SH-2824: crash in curl: LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
...
reviewed by vir
2012-01-04 14:14:23 -07:00
f92fd78e74
merge changes for storm-1790
2012-01-04 10:46:12 -05:00
23362692e1
merge changes for storm-1708
2012-01-04 10:37:17 -05:00
ce6bd89ca4
Changes per Oz's suggestion on RB.
2012-01-04 15:16:35 +00:00
988cb62d43
merge changes for storm-1727
2012-01-04 10:11:59 -05:00
a3e30250e8
merge
2012-01-04 09:59:57 -05:00
d0c7eaa7cf
merge changes for storm-1725
2012-01-04 09:33:50 -05:00
97630acce0
merge changes for storm-1708
2012-01-04 09:32:38 -05:00
1ce22e0a5d
merge changes for latest viewer-development
2012-01-04 09:06:07 -05:00
377a9ab9ac
EXP-1586 ADDITIONAL FIX (Nearby chat window no longer persists between viewer startups)
...
- Got rid of confusing conditions.
2012-01-04 14:50:15 +02:00
1b1ad93c5d
EXP-1512 FIX changing UI size changes cursor position in notecards
...
fixed case where adding text between 2 consecutive newlines created gibberish
2012-01-03 12:21:30 -08:00
9f92904343
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2012-01-03 09:41:49 -08:00
3861249a74
use lazy deletion of views via die() method to avoid some potential crashes
2012-01-03 09:41:16 -08:00
ed431700ed
EXP-1756 FIXED setting user defined window size via floater Window Size.
2011-12-30 22:31:19 +02:00
cbeaf3d7a0
EXP-1586 FIXED (Nearby chat window no longer persists between viewer startups)
...
- Visibility state of chat floater is saved between sessions
- Also visibility state of chat history in nearby chat floater is saved too
2011-12-30 18:32:04 +02:00
0380372a54
EXP-1523 WIP Defensive fix for a crash at LLFolderView::onItemsRemovalConfirmation().
2011-12-30 16:30:26 +02:00
681ecc0d0f
EXP-1593 FIXED Navbar was displayed after exitting hide contorls mode, even if disabled via settings.
...
Apparently, the way we showed/hid the panels was wrong.
2011-12-28 18:35:00 +02:00
6c1219a5e4
EXP-1624 FIXED ([TRANSLATED BUT IN EN] tooltip for chat floater in English: Shows/hides nearby chat log)
...
Reason:
- Panel name was missed in other locales.
Solution:
- Added panel name to other locales.
2011-12-26 20:53:41 +02:00
969e9b3315
EXP-1621 FIXED (Duplicated XUI ID: panel_snapshot_postcard.xml)
...
- Removed duplicated parameters
2011-12-26 16:01:13 +02:00
1a537bb194
EXP-1618 (Serious truncation in top-right status bar "Buy $S" and "Shop" buttons in many languages)
...
- Adjusted width of "shop" button in all locales. Had to override width parameter in xml files of all locales. If to set one value with extra room space for all locales it will look rather ugly for many locales including EN.
2011-12-26 15:57:42 +02:00
032a5e4572
Replacing file filter for windows that was mistakenly removed.
2011-12-25 23:09:32 +00:00
8cf297ab48
EXP-1762 FIXED Pre-select current window resolution.
2011-12-23 20:16:48 +02:00
8a3aa3f6ca
STORM-1790 Provide a Develop sub-menu to change the default logging level
...
co-authored with Zi Ree
2011-12-23 12:06:36 -05:00
4c4543a464
EXP-1732 FIXED "Refresh to Save" message displayed in auto-refresh mode.
2011-12-23 17:44:59 +02:00
f6281d0d86
EXP-1744 FIXED URL-like group display name was shown as hyperlink in the Leave Group confirmation dialog.
2011-12-23 14:18:01 +02:00
62e77147b2
EXP-1632 FIXED Added checking for valid agent avatar before selecting the avatar gender and loading the initial outfit.
2011-12-22 23:27:56 +02:00
7fe5cbc5c2
trivial: some debug code for SH-2623: [PUBLIC_JIRA_USERS][crashhunters] crash at LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *)
2011-12-22 10:44:49 -07:00
7c0b98aa83
merge
2011-12-21 17:58:30 -05:00
ef08cd9dc6
Added tag DRTVWR-106_3.2.5-beta1, 3.2.5-beta1 for changeset 3d2d5d244c63
2011-12-21 17:55:12 -05:00
5546041301
SH-2794 WIP -- work on getting glMapBuffer and friends to behave
2011-12-21 15:55:14 -06:00
570d562f58
merge changes for vmrg-209 and vmrg-210 back from beta branch
2011-12-21 15:21:12 -05:00
55f1d95d97
merge changes for vmrg-210
2011-12-21 15:18:56 -05:00
0ccf2b5a1c
EXP-1693 FIXED the date localization in Item Profile window, Voice Morphs window and in scroll list widget in general.
...
- Added a customizable date format string to be used for scroll list cell of "date" type.
- The date localization does not change the value of a scroll list cell changing only its string representation.
- Added using localized week days and month names from strings.xml for all locales not only Ja and Pl as it was before.
- Changed the date format in Item Profile window (French locale) as noted in the issue description.
- For this fix the French locale still needs the localization of the following strings in strings.xml:
<string name="dateTimeWeekdaysNames">
<string name="dateTimeWeekdaysShortNames">
<string name="dateTimeMonthNames">
<string name="dateTimeMonthShortNames">
<string name="dateTimeDayFormat">
<string name="dateTimeAM">
<string name="dateTimePM">
2011-12-21 14:10:02 +02:00
2455a4bb00
EXP-1695 FIXED currency format in Group Profile > Land/Asset and New Group.
2011-12-21 14:09:56 +02:00
1a51942644
sync with viewer-development
2011-12-20 16:50:23 -08:00
52fab64104
* Added "InventoryOutboxLogging" debug setting to log merchant outbox related web API calls. Each message begins with the tag "SLM".
2011-12-20 16:16:49 -08:00
2a3b7f295f
EXP-1755 FIX -- Can move items to Merchant Outbox during Outbox synch using Copy to Merchant Outbox context menu
...
* "Copy to Merchant Outbox" context menu option no longer available when marketplace import is in progress.
2011-12-20 14:41:30 -08:00
ec06aa129f
add mutex to protect curl_multi-init()
2011-12-20 15:02:21 -07:00
11e192d9a7
EXP-1738 FIX -- Disable drag and drop to folders in the outbox that would create a hierarchy that contains too many folders
...
EXP-1743 FIX -- Tooltip errors given when dragging and dropping folders onto themselves in Merchant Outbox
* Top level folder now reflected in folder count for total folders
* Earlier rejections now honored in drag and drop code so outbox-specific tooltips only show up when appropriate
2011-12-20 11:43:02 -08:00
5dc8e44c76
EXP-1499 FIXED Added some NULL checks in notifications UI code to avoid a crash on exit.
...
The crash happened if connection timed out while there were unread object inventory offers.
2011-12-20 20:44:38 +02:00
1620ad6d00
more tuning of llcurl code targeting crashes like SH-2777.
2011-12-20 11:04:10 -07:00
cfc6ac76e1
more tuning of llcurl code targeting crashes like SH-2777.
2011-12-20 11:04:10 -07:00
b022ebf13c
merge changes for storm-1734
2011-12-20 10:39:06 -05:00
Leslie Linden