0b1ed9af5f
merge
2009-11-03 11:09:44 +08:00
399e922d33
merge + EXT-1926 I18N: the folder name Contents in Build tools > Contents wont honor its translation + EXT-648 Cannot edit an object you are sitting on
2009-11-03 11:06:59 +08:00
3c1c0d7544
Changed the operation of the "mute all" button in the nearby media floater to be closer to spec-compliant, per a design discussion this afternoon.
2009-11-02 17:58:10 -08:00
d220211b4d
EXT-1803 Fix group inspectors closing before you can see them if you can't join the group.
...
Focus issue -- the inspector had no focusable widgets in that case.
Reviewed with Richard.
2009-11-02 17:32:36 -08:00
967e171ed6
merge from remote repo
2009-11-02 16:43:35 -08:00
345c2a02cd
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-02 18:56:30 -05:00
f344c5b7ec
Fix for EXT-894: upload anim preview was using bad texture data instead of grey.
...
Switched rendering of dummy mesh for previews (anim, etc) to use default image,
instead of default avatar image.
-Reviewed by nyx
2009-11-02 18:50:50 -05:00
7e3e89f127
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-11-02 23:46:51 +00:00
8af4e3359c
EXT-1588: Remove support for automatic hyperlinking of URLs in
...
notecards until this issue can be addressed correctly.
The best solution would be to implement support for alternative
display strings for URL text segments. That way, the raw text will
contain the original URL string, but we can show a display-only
alternate label for the URL. Until I get round to doing this, I'm
turning off URL hyperlinking in notecards to avoid the potential
for data loss.
2009-11-02 23:44:21 +00:00
44eea89d00
Make the "default hover controls" be the "authored" controls
...
(and I made a debug setting that can override this)
2009-11-02 15:10:08 -08:00
da3f4c402d
MainInventory aesthetic fixes.
...
--HG--
branch : avatar-pipeline
2009-11-02 18:01:39 -05:00
03ff3dc57d
Added hand-cursor to clickable text boxes, fixed hover_color warnings for login screen.
...
Reviewed with Richard.
2009-11-02 14:58:24 -08:00
5e6868743f
merge
2009-11-02 14:31:14 -08:00
20d9a21468
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-02 14:29:32 -08:00
ed48829af4
Merge commit.
...
--HG--
branch : avatar-pipeline
2009-11-02 17:28:49 -05:00
d1a0cf67bd
mergeypants
2009-11-02 14:27:06 -08:00
88ec0b0dca
Main Inventory Panel layout fixes.
...
--HG--
branch : avatar-pipeline
2009-11-02 17:26:39 -05:00
2a79326ff6
Removed tabs. Fixed errant 'else(APPLE)'
2009-11-02 14:23:40 -08:00
cb2febb017
merge
2009-11-02 14:16:59 -08:00
43c5ab0be2
EXT-1744 1-click Sit object not spawning an object inspector
...
EXT-1810 Right clicking own avatar displayed semi-transparent menus
EXT-1927 Hook up Push-to-talk in Preferences > Advanced
reviewed by richard
2009-11-02 14:11:07 -08:00
729c5730ca
Bottom bar - Change snapshot combo to button, increase width for il8n EXT-2079, Remove deleted art from textures.xml EXT-2080
2009-11-02 13:56:23 -08:00
382174ceb3
merge
2009-11-02 13:49:55 -08:00
5d12c6516e
Fix legacy communicate window tabs being too low, trivial.
2009-11-02 13:24:14 -08:00
310a7b60f7
Merge conflict resolution for previous commit.
...
--HG--
branch : avatar-pipeline
2009-11-02 16:22:18 -05:00
0c196fd769
Bottom bar - Change snapshot combo to button, increase width for il8n EXT-2079, Remove deleted art from textures.xml EXT-2080
2009-11-02 12:45:56 -08:00
bde7d67066
EXT-1866 : Inventory Side Panel
...
svn merge -r137106:137808 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-panel
Porting over changes from svn Inventory Panel work.
2009-11-02 15:39:55 -05:00
74dda61dfb
Added ll_deploy_sharedlibs_command call to mac_updater
2009-11-02 12:37:42 -08:00
f891ca654d
Automated merge with http://hg.lindenlab.com/viewer/viewer-2-0
2009-11-02 12:13:14 -08:00
cf0c0e1824
Added build time script to help deploy shared libs for an arbitrary executable.
...
indra/cmake/DeploySharedLibs.cmake is the script.
LLSharedLibs.cmake contains a macro to ease adding DeployShaerdLibs to a targets build.
Example usage to the mac-crash-reporter. Multiplatform and more to come soon.
Reviewed by brad.
2009-11-02 12:12:32 -08:00
8329d4a04a
merge
2009-11-02 12:04:46 -08:00
b94d2ff4c5
EXT-462 Fixed freeze/eject commands in right-click and avatar inspector menus
...
We were incorrectly only enabling them for gods. They now properly enable
for region/land owners.
2009-11-02 12:03:00 -08:00
7add9de18f
Merge of local changes with latest avp changes.
...
--HG--
branch : avatar-pipeline
2009-11-02 14:22:39 -05:00
7ff2bfd0af
merge changes from product-engine
2009-11-02 11:17:52 -08:00
0a7ac2fc17
merge
2009-11-02 14:17:24 -05:00
86b1ee7703
Work in progress on attachment tracking.
2009-11-02 14:10:56 -05:00
c8e97d83bd
merge
2009-11-02 11:02:55 -08:00
b877665551
merge
2009-11-02 10:55:59 -08:00
7d23b84327
Hook up LLViewerMediaImpl::getName() to call through to LLPluginClassMedia::getMediaName() as it should.
2009-11-02 10:55:25 -08:00
6e018f7143
Fix for compiler warning - passing F64 in as an int
2009-11-02 10:31:05 -08:00
5b7f40df4e
Implemented normal sub-task EXT-1909 (Update IM Control Panels buttons according to the spec) - added 'Open Voice Controls' button. Note Teleport and Pay buttons will be implemented in EXT-957
...
--HG--
branch : product-engine
2009-11-02 19:18:24 +02:00
cdf6390870
merging in viewer2 changes
...
--HG--
branch : avatar-pipeline
2009-11-02 12:13:52 -05: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
f732ee6d2e
EXT-1336 Fix for hover highlight not working correctly with low detail settings.
2009-11-02 16:37:42 +00: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
3dc509bec0
merge
...
--HG--
branch : product-engine
2009-11-02 18:08:04 +02:00
b06bc5944c
fix for normal bug EXT-1982 [BSI] whisper and shout are malformed in Nearby Chat floater & chat toasts
...
--HG--
branch : product-engine
2009-11-02 18:07:04 +02: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
angela