bfec29d46f
merge
2009-11-02 10:02:03 -08:00
116f5c7880
added ignores for winmerge cruft
2009-11-02 10:01:47 -08:00
3783852444
merge
2009-11-02 08:49:05 -08:00
94dfb5c933
Ignore WinMerge .bak temp files.
...
Not reviewed.
2009-11-02 08:48:33 -08:00
b4b516b966
Fix unclear function names around Pacific versus "SLT" time in string operations.
...
Reviewed with Brad.
2009-11-02 08:35:37 -08:00
7e086d4674
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-02 11:29:37 -05:00
9fb250e344
DEV-40744 EXT-332: include viewer version information in the Buy L$
...
requests to the XML-RPC server, including the channel name and the
major, minor, patch, and build version numbers. This information is
needed by the international billing guys to determine whether an
international customer is trying to use a 1.23 viewer to buy L$.
2009-11-02 16:15:22 +00:00
3ec9f79f07
DEV-40702: fixed the audio device enumeration code so that it works
...
with Vivox V2 and V3 SDKs. We were assuming that the <CaptureDevice>
tag contains only a single tag (<Device>), but the V3 SDK returns
other tags such as <DisplayName> and <Type>.
I also added the current Vivox SDK version to the About window so that
it is easier to tell which version your client is actually using.
2009-11-02 15:51:55 +00:00
d8b3e7a021
Added a newline at the end of llui/lliconctrl.cpp to unbork parabuild.
2009-11-02 11:50:17 +00:00
99aa77baae
DEV-41358: Include the current user's maturity and teen ratings in the
...
URL that we send to the Search web page. This can be used to determine
the maturity levels to display. These bools are passed as query params
in the URL (as agreed upon with the search team).
2009-11-02 11:37:44 +00:00
99d9712dd7
additional fix for DEV-41913: parcel media does not display on particle textures.
2009-11-01 17:27:25 -07:00
5d64b6f155
EXT-2056
2009-11-01 00:34:12 -07:00
a10a19de56
Fix font and layout for list items, status bar, people panel tabs, system well EXT-2055
2009-10-31 21:04:38 -07:00
caca1eae26
Convert URLs in notifications and viewer stings to wiki URL format EXT-1952, Reword Abuse Report notification to reduce wordcount EXT-1953
2009-10-31 12:44:34 -07:00
1f3212b680
Add missing eol
2009-10-31 04:25:48 -07:00
4e1cde2e39
merge
2009-10-30 21:34:52 -06:00
01d06db015
sync to the tip.
2009-10-30 21:28:52 -06:00
801301c435
fix DEV-41913: parcel media does not display on particle textures.
2009-10-30 21:22:47 -06:00
a857fe1d82
merge
2009-10-30 19:07:55 -07:00
60771cce54
forgot to add toolt_tip.xml
2009-10-30 19:07:41 -07:00
bc0d740dfe
EXT-2053 Add parcel permission icons to place profile, layout to spec
2009-10-30 19:05:28 -07:00
d8d678307c
merge
2009-10-30 18:24:42 -07:00
2fadd99877
Another experiment: made the selection in the nearby media floater track the media impl the media controls are currently referencing (either focus or hover).
2009-10-30 18:14:20 -07:00
9e602de33a
On a double-click in the nearby media list, try to focus/zoom in on the prim holding the media.
2009-10-30 17:46:48 -07:00
c964f28190
merge
2009-10-30 17:46:28 -07:00
b82bda605d
EXT-2018 PRofile "Real World" descripton scrolls before showing "More" link
...
EXT-2011 titles of IM sessions aren't aligned to center
EXT-3025 Pick's description overlaps picks name
also moved tool tip param default to tool_tip.xml
also made default param<const LLFontGL*> be SansSerif
reviewed by Leyla
2009-10-30 17:46:01 -07:00
123db56856
Initial pass at filling in the list in the nearby media floater.
2009-10-30 17:32:23 -07:00
9abcf6684e
Add implementation for adding and removing items to and from the nearby media list scroll control
2009-10-30 16:08:49 -07:00
c54faf2823
Fix crash in LLMultiFloater::setCanResize()
...
Reviewed (conceptually) by Richard and James
2009-10-30 16:01:58 -07:00
8518ac3e29
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-30 15:38:59 -07:00
b4ef9d2ab5
EXT-2046 Add You are Here and For Sale icons
2009-10-30 15:38:39 -07:00
1fbacbaa9a
Partial implementation of LLFloaterNearbyMedia::refreshList(), with many TODO sections and a bit of ifdef-ed out pseudocode.
...
Initial pass at LLViewerMediaImpl::getProximity(). Currently it just returns the position in the priority list, but that will change.
2009-10-30 14:52:33 -07:00
494b07668b
Add Inventory Look folder (open / closed) and Generic Object art EXT-2042
2009-10-30 14:38:48 -07:00
d6363c6c7a
Fixed a couple problems with getPriorityList().
2009-10-30 14:07:23 -07:00
a326a4e126
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-30 17:57:11 -04:00
597d80fff5
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-30 17:55:15 -04:00
1de55a5870
merge
2009-10-30 17:54:52 -04:00
59c6dc7ed6
Floaters can be resized again - fix for regression introduced yesterday by me.
...
Floater drag handle visibility/enablement was getting lost during construction.
Reviewed with Richard.
2009-10-30 17:54:22 -04:00
4aee82ad98
Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/
2009-10-30 17:49:57 -04:00
d34c8d6337
Made MapAvatarFriendColor Yellow (and added Yellow to color list).
...
https://jira.secondlife.com/browse/EXT-2006
2009-10-30 17:49:00 -04:00
daacf704ad
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-30 17:46:03 -04:00
346458e811
Fix for EXT-1817. Tattoos now default to transparent.
...
Old behavior was setting your skin to white, since they were defaulting to the blank texture.
-Reviewed by nyx
2009-10-30 17:45:16 -04:00
c6c9064273
EXT-1565 Menu bar clock now shows Pacific (PDT/PST) time, as does any other
...
UI widget that references "slt" in the XML.
2009-10-30 16:37:39 -04:00
130fe8184d
Fix a couple other build issues with my previous commit.
2009-10-30 12:48:44 -07:00
b6df544fc0
Fix for typo in my last commit.
2009-10-30 12:38:07 -07:00
043d2d1f9d
Hooks for the "nearby media" UI.
...
Added LLViewerMediaImpl::set/getDisabled(), which will prevent a media instance from loading.
Added LLViewerMedia::set/getInWorldMediaDisabled(), which will disable all inworld media fom loading.
Added LLViewerMedia::getPriorityList() and made the priority comparitor public.
2009-10-30 12:33:25 -07:00
a98591802a
Merge
2009-10-30 12:56:14 -07:00
5702da187d
Implementation for DEV-41993
...
Mutes media on preview widget in media settings/general panel
2009-10-30 12:53:13 -07:00
4cd8311522
merge
2009-10-30 12:41:36 -07:00
71993b14d1
merge with remote repo
2009-10-30 12:05:35 -07:00
richard