8ea12297e2
escape from infinitive loop of fetching inventory folder with NULL uuid
2009-11-09 13:34:32 +08:00
6b7c072c1d
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-08 20:01:33 +00:00
73b1e2bf47
DEV-38840: Fix the Pay Resident floater.
...
It was failing to open due to an unknown string and the L$5 button was
labelled incorrectly (it said L$1).
2009-11-08 19:38:21 +00:00
7cabb9de68
EXT-332: Added support for local currency estimates to the Buy L$
...
and Buy Land floaters.
We now check for a new estimatedLocalCost key from the XML-RPC server,
which provides the estimated cost in the user's local currency, e.g.,
"US$ 10.00" or "10.00 Euros". Note: the server is not currently
sending this information.
The previous codepath still exists and should be unaffected. That is,
we will continue to check for an estimatedCost key from the server with
a value specified in US cents. We give precedence to estimatedLocalCost
though and may want to remove this code once the international billing
server changes go live.
<lynx@lindenlab.com> HG: branch 'default' HG: changed
indra/newview/llcurrencyuimanager.cpp HG: changed
indra/newview/llcurrencyuimanager.h HG: changed
indra/newview/llfloaterbuyland.cpp HG: changed
indra/newview/skins/default/xui/en/floater_buy_land.xml
2009-11-08 17:24:08 +00:00
12f038b599
DEV-42215: Don't zap valid g(First|Last)name with empty strings.
...
In the --autologin case, gFirstname, gLastname were validly set from
gSavedSettings, but at the last minute were overwritten with empty strings
from gLoginHandler. Only perform those assignments if gLoginHandler has
non-empty strings to contribute.
2009-11-07 12:49:07 -05:00
f76dab71d6
merge
2009-11-07 09:40:03 -08:00
c4a5030caa
Fix for low bug EXT-2248 "Redundant vertical scroll-bar in Place Profile panel".
...
--HG--
branch : product-engine
2009-11-07 18:01:38 +02:00
e360a44464
Fixed normal bug EXT-2314 "Restore maturity rating in "Landmark" and "Teleport History" views":
...
- Added rating icons and text to "Landmark" and "Teleport History" views.
- Removed code for "Last Visited" from Teleport History.
--HG--
branch : product-engine
2009-11-07 17:20:52 +02:00
4e420a36c6
Fix for missing LOD spam.
2009-11-07 08:22:39 -06:00
eecf91653b
Fixed low bug EXT-1963 "Unexpected gray square in the bottom of Places panel":
...
- Fixed reference to a missing texture.
--HG--
branch : product-engine
2009-11-07 15:01:04 +02:00
5fba55f58e
Partial fix for DEV-42153.
...
This code seems to work on some objects and not on others. I suspect I'm not doing something quite right in LLVOVolume::getApproximateFaceNormal().
2009-11-06 19:30:52 -08:00
fcbad172a6
Added camera preset art and attached to camera controls
2009-11-06 18:57:35 -08:00
8631443847
merge changes from product-engine
2009-11-06 18:13:38 -08:00
ce60f82b23
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-06 18:10:24 -08:00
4a2b77aebb
New inventory icon
2009-11-06 18:08:51 -08:00
5e85642650
Temp fix to prevent crash while missing sidepanel_task_info.xml.
2009-11-06 18:04:29 -08:00
06ba4927aa
Changed copy of libuuid.so to libuuid.so.1
2009-11-06 17:19:47 -08:00
485dcd9a8f
Fixed textrue prioritization so that boosted textures are always highest priority.
2009-11-06 16:16:01 -08:00
0a5cbfd195
EXT-2031 Admin Menu Missing Without Advanced Menu Enabled
2009-11-06 16:14:42 -08:00
66cf090114
Adding new option definition - forgot.
2009-11-06 15:54:11 -08:00
99f75c9bca
Add support for externally specified revision number (codeticket)
2009-11-06 15:52:51 -08:00
35ae408547
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-06 18:42:51 -05:00
573e986ea2
Merge of avatar-pipeline changes into viewer2
2009-11-06 18:41:47 -05:00
9c048d12fd
merge
...
--HG--
branch : avatar-pipeline
2009-11-06 18:31:52 -05:00
1c40cf8225
merge
2009-11-06 15:29:32 -08:00
3fa1e785a6
EXT-1576 "Zoom In" menu option should be disabled when the person is not in range
...
EXT-2306 Default voice input/output pref panel to closed
2009-11-06 15:16:40 -08:00
4b9abdc833
Reverting OSX changes to expat from texture-pipeline merge
2009-11-06 14:51:52 -08:00
a24eee0dd6
DEV-42272 - viewer crash on startup in LLCurlRequest::process
2009-11-06 14:36:16 -08:00
2aa981ac23
EXT-2278 : "Save Texture As" for bottom panel
...
EXT-2310 : "Save Texture As" for inventory right-click menu
"Save Texture As" now works properly and brings up the texture preview while saving.
Also added "Save Texture As" to the right-click inventory context menu.
--HG--
branch : avatar-pipeline
2009-11-06 17:35:05 -05:00
72af8dc3f0
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-06 14:08:27 -08:00
f3bbcfb9d4
merge
2009-11-06 14:07:40 -08:00
0b3bbf8cfc
EXT-1501 Menu fonts now configurable in XUI, set size to SansSerifSmall
2009-11-06 13:51:16 -08:00
d158cc8619
Don't hg ignore the newview/skins directory, we add files there regularly.
2009-11-06 13:49:07 -08:00
98eb085b64
Changed llwarns on spurious InventoryPanel::buildNewViews debug mesage to lldebugs.
...
--HG--
branch : avatar-pipeline
2009-11-06 16:30:35 -05:00
2911fa2270
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-06 16:13:56 -05:00
f7483487c4
Changed "Support" tab to "Info".
...
http://jira.secondlife.com/browse/EXT-2177
2009-11-06 16:11:42 -05:00
78db8dd83b
merge from remote repo
2009-11-06 13:09:48 -08:00
d4f790f728
FIX: zoom/unzoom should appear to be one icon
...
this was a fairly trivial UI change....
2009-11-06 13:07:50 -08:00
eea1057b70
EXT-2215 - Viewer crashes while trying to decode image
...
llwarns is not entirely thread safe. Need to fix that, but for now, use LL_DEBUGS instead.
2009-11-06 12:58:10 -08:00
913c29f709
Automated merge with http://hg.lindenlab.com/viewer/viewer-2-0
2009-11-06 12:54:57 -08:00
9317e46a87
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
2009-11-06 12:54:33 -08:00
3f81727078
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-11-06 15:45:56 -05:00
c9b03c56af
Updated default_profile_picture to match style. Added Blank graphic to use as overlay icon (in order to produce tool-tip). Created panel_profile_user.xml which is a profile panel specifically for the current user, and modified panel_me_profile to call it accordingly.
...
http://jira.secondlife.com/browse/EXT-2245
2009-11-06 15:44:43 -05:00
113c7edf60
FIX DEV-41587: Update current URL in draw()
...
The current URL is now re-fetched from the current selection.
Also did some minor refactoring
2009-11-06 12:21:21 -08:00
0db73b1ac5
merge
2009-11-06 12:20:52 -08:00
afe6350160
merge from texture-pipeline
2009-11-06 12:15:41 -08:00
5b5df47697
Make test text floaters so Erica can make a call on final font sizes.
2009-11-06 12:15:36 -08:00
9c55ff9390
Fixed normal bug EXT-1509 "Going into mouselook while in a private call
...
ruins the call floater.":
- Made callfloater a single instance floater.
- Updated floater IM panel visibility change logic.
- Added NULL checks for voice client pointers in LLFloaterIMPanel.
--HG--
branch : product-engine
2009-11-06 22:13:59 +02:00
4dbd169537
fixed bug EXT-2239 Preferences > Graphics has 2 entry fields for UI Size
...
--HG--
branch : product-engine
2009-11-06 21:38:16 +02:00
591d9d5c2b
hg merge
...
--HG--
branch : product-engine
2009-11-06 21:30:10 +02:00
angela