Lynx Linden
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
Rick Pasetto
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
callum
66ce1b0429
Added CMake file for new cpp/h file
2009-11-02 15:05:38 -08:00
Loren Shih
da3f4c402d
MainInventory aesthetic fixes.
...
--HG--
branch : avatar-pipeline
2009-11-02 18:01:39 -05:00
richard
a6b6ca9a24
made floater close/minimize buttons "chrome" so they don't take keyboard focus
...
removed LLHudView::colorFromType which was unused
reviewed by James
2009-11-02 14:58:39 -08:00
James Cook
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
Palmer
c4817c4e58
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-02 14:45:56 -08:00
Leyla Farazha
5e6868743f
merge
2009-11-02 14:31:14 -08:00
Erica
20d9a21468
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-02 14:29:32 -08:00
Loren Shih
ed48829af4
Merge commit.
...
--HG--
branch : avatar-pipeline
2009-11-02 17:28:49 -05:00
Erica
d1a0cf67bd
mergeypants
2009-11-02 14:27:06 -08:00
Loren Shih
88ec0b0dca
Main Inventory Panel layout fixes.
...
--HG--
branch : avatar-pipeline
2009-11-02 17:26:39 -05:00
Mark Palange (Mani)
2a79326ff6
Removed tabs. Fixed errant 'else(APPLE)'
2009-11-02 14:23:40 -08:00
Leyla Farazha
cb2febb017
merge
2009-11-02 14:16:59 -08:00
Leyla Farazha
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
brad kittenbrink
589d64fda7
Merging my DEV-41722 work with viewer-2-0
2009-11-02 16:59:32 -05:00
Erica
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
brad kittenbrink
90ea3d3b35
Implemented linux staging for DEV-41722 normalizing shared lib staging.
2009-11-02 16:53:50 -05:00
James Cook
382174ceb3
merge
2009-11-02 13:49:55 -08:00
James Cook
5d12c6516e
Fix legacy communicate window tabs being too low, trivial.
2009-11-02 13:24:14 -08:00
Loren Shih
310a7b60f7
Merge conflict resolution for previous commit.
...
--HG--
branch : avatar-pipeline
2009-11-02 16:22:18 -05:00
Erica
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
Loren Shih
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
palange
74dda61dfb
Added ll_deploy_sharedlibs_command call to mac_updater
2009-11-02 12:37:42 -08:00
palange
f891ca654d
Automated merge with http://hg.lindenlab.com/viewer/viewer-2-0
2009-11-02 12:13:14 -08:00
palange
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
James Cook
8329d4a04a
merge
2009-11-02 12:04:46 -08:00
James Cook
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
Denis Serdjuk
3a8a93d596
fix for EXT-1232 \"You are Here\" banner for Place Profile - Parcel Characteristics
...
Note:
Now distance check is not depend on Z coordinate
--HG--
branch : product-engine
2009-11-02 21:53:31 +02:00
Denis Serdjuk
08f1e05552
fixed major bug EXT-1984 Speak button light should not disable when voice channel is open
...
--HG--
branch : product-engine
2009-11-02 21:51:39 +02:00
Palmer
e3b84e806a
Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0
2009-11-02 11:28:29 -08:00
Eugene Kondrashev
d4a3ccc52c
Fixed normal bug EXT-957-IM Verb button missing
...
--HG--
branch : product-engine
2009-11-02 21:27:37 +02:00
Brad Payne (Vir Linden)
7add9de18f
Merge of local changes with latest avp changes.
...
--HG--
branch : avatar-pipeline
2009-11-02 14:22:39 -05:00
Steve Bennetts
7ff2bfd0af
merge changes from product-engine
2009-11-02 11:17:52 -08:00
Brad Payne (Vir Linden)
0a7ac2fc17
merge
2009-11-02 14:17:24 -05:00
Brad Payne (Vir Linden)
86b1ee7703
Work in progress on attachment tracking.
2009-11-02 14:10:56 -05:00
Steve Bennetts
c8e97d83bd
merge
2009-11-02 11:02:55 -08:00
Steve Bennetts
b877665551
merge
2009-11-02 10:55:59 -08:00
Monroe Linden
7d23b84327
Hook up LLViewerMediaImpl::getName() to call through to LLPluginClassMedia::getMediaName() as it should.
2009-11-02 10:55:25 -08:00
brad kittenbrink
35469b04a0
Implemented mac staging for DEV-41722 normalizing shared lib staging.
...
also added a bunch of comments.
2009-11-02 13:52:44 -05:00
Nyx (Neal Orman)
0284725886
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-11-02 13:33:56 -05:00
callum
6e018f7143
Fix for compiler warning - passing F64 in as an int
2009-11-02 10:31:05 -08:00
Sergei Litovchuk
a3f90362cc
no ticket. Fixed warnings of "use_ellipses" parameter.
...
--HG--
branch : product-engine
2009-11-02 20:23:30 +02:00
richard
bfec29d46f
merge
2009-11-02 10:02:03 -08:00
richard
116f5c7880
added ignores for winmerge cruft
2009-11-02 10:01:47 -08:00
Rick Pasetto
9ed8b5299f
Merge from remote repo
2009-11-02 09:54:52 -08:00
Eugene Mutavchi
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
Eric M. Tulla (BigPapi)
cdf6390870
merging in viewer2 changes
...
--HG--
branch : avatar-pipeline
2009-11-02 12:13:52 -05:00
James Cook
3783852444
merge
2009-11-02 08:49:05 -08:00
James Cook
94dfb5c933
Ignore WinMerge .bak temp files.
...
Not reviewed.
2009-11-02 08:48:33 -08:00