Commit Graph

12286 Commits (e8d1ddb22545fa2abc0400d7af64e82c79fffa95)

Author SHA1 Message Date
Nyx (Neal Orman) e8d1ddb225 SH-188 FIX crash in llvoavatar.cpp
We were using a NULL pointer after checking it. Did some logic juggling to
ensure that we only use the pointer if it is non-null

Code reviewed by Seraph
(transplanted from a90fe10ddac9545249c6f218af438a36bcbc3162)
2010-09-22 18:09:17 -04:00
Dessie Linden 02a4c4ac0d Corrected channel name(s) and version number 2010-09-21 13:51:40 -07:00
Kent Quirk 5304ad2746 Tag for beta 2.1.3 2010-09-21 12:00:07 -04:00
Tofu Linden 90cd379508 merge storm-189 2010-09-21 14:58:37 +01:00
Tofu Linden a552660984 STORM-165 decode_priority clamp issue in texture fetching
Patch by Merov ported and reviewed by Tofu, from SG2.
2010-09-21 13:08:33 +01:00
Sergei Litovchuk 101bf8f023 STORM-189 FIXED Applied text wrapping to fix long string truncation in Build tools->Features. 2010-09-21 00:17:16 +03:00
Tofu Linden 14cf6fd5a2 merge from http://bitbucket.org/boroondas/viewer-development-vwr-20583 2010-09-20 18:15:20 +01:00
Tofu Linden 6a28f9b242 merge storm-192 2010-09-20 18:03:25 +01:00
Vadim Savchuk 022f9bd9a8 STORM-192 ADDITIONAL FIX Fixed crash on pressing Ctrl+Shift+W (which closes all floaters).
The crash was introduced by my previous fix of this ticket in changeset 8ceebd3612f0.
The problem was that, suprisingly, even invisible (faded) toasts were destroyed when you hit Ctrl_Shift+W,
however they were still referenced by the toast pool, so the references were invalidated.

The easiest fix would be to remove all references to the toast being destroyed, no matter is it visible or not.
However, then we'd have to search for each destroyed toast in the pool, which is slow.
Besides, removing toasts from the pool compromises the whole idea of pooling (which was introduced to speed up creation of new toasts).

Another possible fix is not to destroy any nearby chat toasts when user hits Ctrl+Shift+W.
That would save us from any crashes at a price of changing existing behaviour (the toasts will remain visible).

So I went for a third option: when closing all floaters, skip invisible ones.
Then there won't be attempts to destroy invisible (pooled) toasts, so the crash won't happen,
and we don't seem to change any existing behavior.
However I'm not 100% sure of the latter statement, so the fix requires extensive testing.
2010-09-20 19:08:45 +03:00
Tofu Linden 85f69fbd86 merge storm-159 2010-09-20 12:53:10 +01:00
Tofu Linden b92ca367ae merge storm-192 2010-09-18 11:18:13 +01:00
Tofu Linden 9b0da85a47 merge storm-153 2010-09-18 11:17:39 +01:00
Merov Linden 01b1d3cc95 STORM-183 : Pull in fix from Vadim 2010-09-17 17:00:07 -07:00
Sergei Litovchuk 98e6d56beb STORM-159 FIXED Added sharing inventory item by dropping it on resident's Profile SP even when no IM session is started with that resident. 2010-09-18 01:16:50 +03:00
Vadim Savchuk 8eb6c6dec8 STORM-183 ADDITIONAL FIX Disabled the "Replace Current Outfit" option of the inventory context menu for incomplete outfits. 2010-09-17 22:52:51 +03:00
Vadim Savchuk 5fac8e4fd0 STORM-192 FIXED Ctrl-Shift-W not to disable nearby chat toasts.
Bug reason: The fix of EXT-1419 disables showing nearby chat showing toasts at all whenever you close one.
That was done to prevent a crash when viewer is exiting, but closing a toast manually should be handled differently.

Fix: If a toast is being closed (destroyed) manually, just remove it from the toast pool
(to prevent further references to the invalid pointer), but keep on showing new toasts.
I've overriden LLFloater::onClose() to differentiate the two cases.
2010-09-17 22:21:00 +03:00
Andrew Dyukov 98c49322c1 STORM-153 FIXED Localized Conference and non-existent IM session name strings.
- Moved the "no session" string to XML and used it in code instead of hardcode.



- Conference string turned out to be already translated, but the way translation was happening ad-hoc chat log files on disk
would get localized names, and thus be inconsistent (and that would create problems with browsing them later).
It didn't happen already just because this string wasn't translated in other locales somewhy.
So moved localization of session name after the the creation of log file.
Also changed value of string according to Eli's comment in ticket.
2010-09-17 20:11:17 +03:00
Christian Goetze (CG) 7c3a81f577 Merge in lenny work 2010-09-17 09:57:38 -07:00
Christian Goetze (CG) 0974f18da5 Enable all platforms, show changes since a recent merge 2010-09-17 09:57:24 -07:00
Tofu Linden 27bbf79c89 merge. 2010-09-17 17:40:34 +01:00
Tofu Linden 285720fc77 merge dead-code removal from Andrew@PE 2010-09-17 16:05:15 +01:00
Tofu Linden 5f693246ab merge storm-154 2010-09-17 15:37:50 +01:00
eli_linden 30c8979e15 CT-575 WIP ES linguistic, remove invalid FR element 2010-09-16 18:15:44 -07:00
eli_linden 6d21f5e496 VWR-22340 FIX en_xui_change for all langs, and remove many evil old overrides 2010-09-16 18:06:46 -07:00
Oz Linden 5215bf9925 [STORM-175] Fix Ping Interpolate Object Position 2010-09-16 20:01:35 -04:00
Christian Goetze (CG) d006b832b3 Test using parallel linking 2010-09-16 16:50:36 -07:00
eli_linden 7ef0e0b92f Merge 2010-09-16 15:00:10 -07:00
eli_linden 54482096c5 VWR-22408 FIX en_xui_change to accommodate text for FR and PT 2010-09-16 14:59:14 -07:00
Tofu Linden 586ad99554 merge 2010-09-16 21:24:22 +01:00
Tofu Linden 0efca82b5e merge 2010-09-16 21:24:09 +01:00
Sergei Litovchuk ca6190f925 STORM-156 FIXED Increased "Add Friend" button width. Disabled owerflow button resizing to get more space for other buttons. 2010-09-16 23:08:42 +03:00
Sergei Litovchuk 7f693051a2 STORM-154 FIXED Resized Group Info panel buttons to prevent Group Call button label truncation.
Removed commented out button and extra layout stack from panel_group_info_sidetray.xml
Resized buttons to use remaining free space when Create Group button is invisible.
2010-09-16 22:48:37 +03:00
Andrew Dyukov 73ba940ffe A little refactoring.
Removed unused code and xml data which were once used for date in status bar.
2010-09-16 22:10:20 +03:00
eli_linden fbffeea75b Merge 2010-09-16 12:07:29 -07:00
eli_linden 7828157770 VWR-22347 FIX remove FR old overriding parameters 2010-09-16 12:06:28 -07:00
Christian Goetze (CG) f78547cb42 Merging work to make lenny build 2010-09-16 12:03:36 -07:00
Christian Goetze (CG) 79ea7b4374 Try building all variants now. 2010-09-16 12:03:01 -07:00
Vadim Savchuk c331607d97 STORM-185 FIXED Don't reset accordions in the Outfit Edit panel when a wearable gets worn.
The fix consists of two parts:
1. Saving/restoring scrollbar position when refreshing the clothing/attachments/bodyparts lists
   (the lists get refreshed on COF change).
2. Not resetting expanded accordion tab upon wearing an item (which was introduced with the fix of EXT-8164).

So, apart from preserving scrollbar position (which is what the bug reporter requests),
I also fixed that when you wear something, the Clothing accordion was always expanded.
2010-09-16 22:01:40 +03:00
Tofu Linden 82b91b1343 merge storm-130 2010-09-16 19:59:56 +01:00
Tofu Linden 54c8ef13a9 merge snow-107 2010-09-16 19:59:17 +01:00
Tofu Linden 395a5cbaff merge 2010-09-16 19:55:55 +01:00
Andrew Dyukov f0ba3d35b2 STORM-107 FIXED Fixed Polish character corruption in date.
Added polish language to list of languages that use months and days names from localized xmls.
It solved the problem of accented Polish characters "approximation" to their ASCII brethren on non-Polish Windows locales. Now all accented symbols look right.
2010-09-16 20:58:02 +03:00
Merov Linden 128bcffb62 STORM-183 : Pull and merge in viewer-development 2010-09-16 10:35:58 -07:00
Tofu Linden 242206ea25 merge storm-149 2010-09-16 18:20:08 +01:00
Tofu Linden 73467a0f30 merge vwr-20694 / storm-157 2010-09-16 18:19:36 +01:00
Tofu Linden 3573459811 merge storm-180 2010-09-16 18:19:03 +01:00
Andrew Dyukov 0098a23607 STORM-180 FIXED Fixed crash on login in Japanese locale.
The crash was caused by erroneous getting of month name from vector with week day names in LLStringUtil::formatDatetime().
This code woth introduced in June, so though it didn't work properly, it didn't cause the crash(cause June is 5th month). But when
number of current month exceeded number of days in week(this happened in August cause it is 8th) code started getting 8th element from
vector with 7. This caused the crash. It reproduced only on Japanese locale because only there code that caused it was used(see STORM-177
for details). This changeset seems to fix STORM-177 too.

- Used vector with months names where it should be.
2010-09-16 20:01:00 +03:00
Vadim Savchuk 3641e9cfc8 STORM-186 FIXED The "Take Off - Remove from current outfit" option of the My Outfits gear menu now ignores item selection, taking aff all wearables. 2010-09-16 19:42:18 +03:00
Vadim Savchuk 4495dd26f8 STORM-183 FIXED The "Replace Current Outfit" option of the My Outfits gear menu (which is only applicable to outfits) wasn't disabled for selected wearables. 2010-09-16 18:25:27 +03:00
Aimee Linden 1dbcc3fff7 STORM-92 MERGE 2010-09-16 11:31:06 +01:00