d33b6a1887
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 09:15:18 -07:00
2f9cc80c2e
fixed EXT-5910 “Offers logging”,
...
fixed IM message counter when received interactive notification(offer);
corrected logging to file of offer notification;
enabled logging for FRIENDSHIP_ACCEPTED notification;
--HG--
branch : product-engine
2010-03-05 17:53:32 +02: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
27283c1de7
fixed EXT-5910 “Offers logging”,
...
made logging offer notifications as from SecondLife;
--HG--
branch : product-engine
2010-03-05 14:13:37 +02:00
f1a4dc710d
merge from viewer-2-0
2010-03-05 11:13:26 +00: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
462ab1c752
fixed EXT-5908 “Accepted friendship notification shouldn't spawn chiclet”,
...
made not spawn IM chiclet friendship accepted notification;
added friendship accepted notification to syswell chiclet;
--HG--
branch : product-engine
2010-03-05 12:37:06 +02: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
2ce7807c9e
Fix for EXT-5960 (Store media cookies per user rather than per viewer)
...
Reviewed by RN and MW
2010-03-04 14:31:10 -08:00
14579a1cca
EXT-2188 PL set5A xlation; 1 JA ling fix
2010-03-04 14:14:34 -08:00
d0aae36ae5
EXT-2188 PL set5A xlation; 1 JA ling fix
2010-03-04 14:14:25 -08:00
b0d4919fd4
fix for EXT-5683: viewer crashes at llcommon/llworkerthread.cpp(323): ERROR: LLWorkerClass::checkWork: ASSERT(workreq).
2010-03-04 15:02:30 -07:00
95ee21b913
beta 4 JA linguistic
2010-03-04 13:55:36 -08:00
49bdfd7fbb
Merge
2010-03-04 13:49:14 -08:00
4c342ea57c
CT-575 DA xlation, new files
2010-03-04 13:48:00 -08:00
bb2b916fec
CT-575 DA xlation
2010-03-04 13:47:46 -08:00
f8916165f9
automated merge viewer2.0->viewer2.0
2010-03-04 15:31:35 -05:00
2a60fdb197
EXT-5296 : Inventory folders revert to defort "sort" with each login
...
Minor cleanup to start using DEFAULT_SORT_ORDER versus plain text "InventorySortOrder" in a few plaecs in the code. Makes this sorting code a lot easier to debug.
2010-03-04 15:29:49 -05:00
f5b63df813
VWR-18007
2010-03-04 12:20:54 -08:00
b35ffd5304
Fix for EXT-5935
...
Decrease PluginInstancesCPULimit default value from 1.0 to 0.9.
2010-03-04 11:36:29 -08:00
1201b24d41
Merge
2010-03-04 11:23:56 -08:00
96fd925349
Merge
2010-03-04 11:21:14 -08:00
50cc48de28
merge.
2010-03-04 19:20:28 +00:00
982aec721f
EXT-5296 : Inventory folders revert to defort "sort" with each login
...
Not my code, but ended up being a simple enough XML fix. Inventory sorting settings have changed in viewer2 from viewer1.23, this seems to be causing at least a couple of bugs. Fixed one, filing the other.
2010-03-04 14:18:38 -05:00
d0cd8f94db
cycle6 DE JA xlation, new files
2010-03-04 11:12:01 -08:00
9fe4f49079
cycle6 DE JA xlation; beta 4 DE linguistic fix
2010-03-04 11:11:44 -08:00
462a49fb9d
EXT-5919 Clean up fuzzy type in Buy L$
2010-03-04 11:06:11 -08:00
66b60a71f1
Implemented normal subtasks EXT-5906 (Reverse buttons order in the inventory offers) and EXT-5907 (Reverse buttons order in the friendship offer).
...
- Used reverse iterator when iterating over control list in LLChatHistory::appendMessage().
--HG--
branch : product-engine
2010-03-04 19:37:26 +02:00
3d81e9e7f1
PE merge.
2010-03-04 17:33:55 +00:00
Xiaohong Bao