eee50d1401
Fix for a crash on startup/shutdown introduced in the tip of viewer-2-0 very recently.
...
list.erase(list.find()) is not safe, because erasing list.end() is undefined. Check to make sure the find succeeded before doing the erase.
Reviewed by Richard at http://codereview.lindenlab.com/341001
2010-03-05 18:11:55 -08:00
9412447b4f
merge
2010-03-05 17:41:02 -08:00
7cea645ba2
added some logging to help track down crash in EXT-5849
2010-03-05 17:38:21 -08:00
64b5c53156
Merge
2010-03-05 16:21:45 -08:00
f92a3add59
VWR-17723
2010-03-05 16:07:59 -08:00
218a60ea9e
VWR-17121 en_xui_change
2010-03-05 15:50:09 -08:00
a3fa96ff0e
merge
2010-03-05 15:41:37 -08:00
27919e106a
fix for merge
2010-03-05 15:41:15 -08:00
90e7506cae
VWR-17116 en_xui_change
2010-03-05 15:32:50 -08:00
931ff555bd
merge
2010-03-05 14:46:00 -08:00
f0ea8083eb
Merge
2010-03-05 14:44:30 -08:00
a714e9ed7e
VWR-17558 en_xui_change
2010-03-05 14:07:11 -08:00
ae66c372ec
VWR-17687 en_xui_change
2010-03-05 13:53:20 -08:00
eee6b1c779
VWR-17686
2010-03-05 13:45:06 -08:00
f22423fb29
VWR-17362
2010-03-05 13:34:40 -08:00
18687a3652
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 16:31:29 -05:00
65ecde210e
Fix Mac llmediaplugintest build breakage.
...
A viewport array passed to glGetIntegerv() and gluUnProject() was declared as
'int'. This compiles on Windows, but fails on Mac. Declaring as 'GLint' works.
2010-03-05 16:29:37 -05:00
b70951ca1e
merge
2010-03-05 13:11:26 -08:00
dd663449b6
Only comments added to crash reporting code on handling old crash logs on mac. No code changed :)
2010-03-05 13:07:32 -08:00
32aa06139e
EXT-5698 undo local FR override (not good practice); fix EN instead for consistency, and to allow for ES longer translation of "Buy" (Erica changed "Buy L$" to "Buy" to mitigate the problem)
2010-03-05 11:34:24 -08:00
5eb5602220
Merge
2010-03-05 11:08:30 -08:00
8e4aa522b2
beta 4 JA linguistic
2010-03-05 10:53:28 -08:00
b9a96aaeb3
merge.
2010-03-05 17:53:38 +00:00
a027e1d6e5
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 11:55:48 -05:00
efd51b6c02
PE merge.
2010-03-05 16:30:32 +00:00
d33b6a1887
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 09:15:18 -07:00
2433de3fac
merge
...
--HG--
branch : product-engine
2010-03-05 17:45:59 +02:00
66faaf34c4
Merge from default branch
...
--HG--
branch : product-engine
2010-03-05 17:44:55 +02:00
a4937c0124
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 10:28:39 -05:00
40230fa605
EXT-5847 failure to bake when standard wearables are generated
...
Standard wearables have no textures associated with them. No textures means no texture callbacks.
Fixed the issue by requesting a texture upload on baked textures that we don't get a cahced baked
texture response for. This clears up the repro
Code reviewed by prep, vir
2010-03-05 10:25:30 -05:00
f7ad793e54
merge.
2010-03-05 15:23:58 +00:00
cfe3336cc3
Backed out changeset ede35a3eda50 - restore EXT-5891
...
The specs contradict themselves and I *like* this interpretation better.
2010-03-05 15:23:48 +00:00
698835061b
Update for major bug EXT-5943 - Classifieds are Published and charged as soon as you hit Save.
...
Fixed category mismatch after editing classified.
Made price uneditable in edit mode because it looks like server does not support price update(same in viewer 1.23)
--HG--
branch : product-engine
2010-03-05 17:23:41 +02:00
a8e1c2ed13
Implemented (EXT-4705) Show maturity icon on Region/Estate tab.
...
- Added LLIconsComboBox class - a combobox with icons for maturity ratings.
- Fixed scroll list maximum width calculation. The width was calculated based on text value width for non-text columns.
- Added image overlay alignment getter method to LLButton.
--HG--
branch : product-engine
2010-03-05 15:41:25 +02:00
baafdf216f
Fixed (EXT-4704) Add maturity icons to Prefs -> General.
...
- Added icons updating upon opening Prefs -> General panel.
--HG--
branch : product-engine
2010-03-05 15:36:01 +02:00
a1bcb21b3c
merge
...
--HG--
branch : product-engine
2010-03-05 13:09:44 +02:00
a5c202dcfd
PE merge.
2010-03-05 10:43:24 +00:00
0940d4499f
fix for normal EXT-1888 Apply button remains active after Applying changes
...
--HG--
branch : product-engine
2010-03-05 10:40:28 +02:00
17c66d71b1
Merged recent PE classified panel changes with LL fixes for EXT-5824, EXT-5860 and EXT-5859.
...
--HG--
branch : product-engine
2010-03-05 10:15:57 +02:00
cc5d5f76b0
Updated LLPanelClassifiedInfo::resetData() with recentrly added controls.
...
--HG--
branch : product-engine
2010-03-05 09:33:37 +02:00
eb037986bd
Update for normal sub task EXT-5856 - "Auto renew each week" checkbox is displayed in the Classified Info from other resident profile.
...
Replaced auto_renew checkbox with textbox.
--HG--
branch : product-engine
2010-03-05 09:30:40 +02:00
2d2d2086f4
merge conflicts
2010-03-05 13:17:23 +08:00
c18611d72a
EXT-5698 Media/Play pause are trunkated in french floater.
2010-03-05 13:14:01 +08:00
feb693662c
beta 4 JA linguistic
2010-03-04 18:38:44 -08:00
485711e179
removed extraneous updateBoundingRect() calls
...
remove the login progress panel as a popup only after it has finished fading out
popupview manages it's own registering and unregistering of popup callbacks
2010-03-04 16:35:52 -08:00
dbeb30f461
Merge
2010-03-04 15:29:39 -08:00
f2e2cfd217
CT-575 ES xlation
2010-03-04 15:27:29 -08:00
5208aa56bd
fixed expandable text box not hiding when clicking off them
2010-03-04 15:27:28 -08:00
88cf648176
Merge with tip
2010-03-04 14:33:25 -08:00
34c8f6f7fa
Changes to plugin test app in preparation for work on positional per-process audio for media.
...
Not part of the client and nothing here is deployed - internal testing only.
2010-03-04 14:32:24 -08:00
Monroe Linden