2438a9168b
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-23 09:56:16 -04:00
312cf3cf88
EXT-1698 I18N: the string (worn) or (worn on left hand) wont honor its translation
2009-10-23 20:07:53 +08:00
9c3ae7a243
Fix for DEV-41563 / EXT-1814. Partial revert of revision 136284.
...
These textures are used during terrain rendering. Not having them also
breaks invisiprims in an interesting way.
2009-10-23 07:02:30 +00:00
c8485374dd
add help topic to floater media setting and it's panels
2009-10-23 12:06:31 +08:00
0e6c92ec06
Merge before push
2009-10-22 18:11:23 -07:00
f31b0baff4
merge
2009-10-22 18:10:47 -07:00
318e4784d2
No Jira - added some new bookmarks to include Flash based sites
...
for testing purposes.
2009-10-22 18:09:38 -07:00
bd981a4b83
Fix for DEV-41643 "stray "(none)" in the Media Settings Controls"
...
removing name attribute stopped "Missing String" message
appearing - don't know why - asking around.
2009-10-22 18:09:08 -07:00
12c38ccd6a
Ext-1110 - Unable to select whole text by mouse in the text widget
2009-10-22 18:09:07 -07:00
87b079bd6b
fix for text history being lost when closing chat history floater
...
reviewed by James
2009-10-22 17:38:26 -07:00
07ffe9c149
merge from pull
2009-10-22 17:36:00 -07:00
350138e2bb
EXT-287 Side tray open/close arrows are now an image, not the text "<<" and ">>"
...
Removed some dead code from LLSideTray
Next step is to merge all the tab art with overlay art and use button selected images to show a "pressed" state for all buttons.
Reviewed with Angela.
2009-10-22 17:30:45 -07:00
b88fc256a3
EXT-1654 - Attempt to fix crash on close by cleaning up some callbacks
...
Reviewed by Richard
2009-10-22 17:07:33 -07:00
716e2b8dd2
Let Python handle quoting of Mac run_command() args (using %r).
2009-10-22 20:06:54 -04:00
9ca162fbfe
moose
2009-10-22 16:09:49 -07:00
872ecdbec6
EXT-1449 Viewer 2.0 Fit & Finish Pass: Places Panel - Landmark detail -actually deleted the file this time
2009-10-22 15:59:37 -07:00
52253a7fa3
merge
2009-10-22 15:42:08 -07:00
3431664430
Moved internal LLSideTrayTab class to .cpp file, de-inline param block constructor, not reviewed
2009-10-22 15:40:59 -07:00
f67e44c503
Fixing the build for PE.
...
Now building with llkdu can be skipped by specifying INSTALL_PROPRIETARY=OFF when configuring the build.
Reviewed by palmer
2009-10-22 15:38:26 -07:00
35e8a7cae6
Merge my changes with rev. 2603
2009-10-22 15:35:14 -07:00
f7e4f1d1a5
DEV-41721 - "Alt-image enabled" is not yet functional: remove from UI
2009-10-22 15:32:22 -07:00
01da5df6b4
DEV-41720 - "Select Texture" should be "Select Face" in build tools
2009-10-22 15:31:58 -07:00
4e6fd496ee
EXT-1822 changing textures in appearance not immediate
...
Texture changes in appearance editor were not taking effect immediately. Changed texture setting code to refresh local bake of textures.
Code reviewed by Vir
2009-10-22 22:25:38 +00:00
08ccc8384e
EXT-1449 Viewer 2.0 Fit & Finish Pass: Places Panel - Landmark detail
2009-10-22 15:17:06 -07:00
aba9c25556
merge from remote repo
2009-10-22 15:04:33 -07:00
eb5a619255
DEV-41626 Remove/disable "first click interacts" from the UI since
...
we're not implementing it as a feature yet.
2009-10-22 15:03:55 -07:00
b8ce05ed08
merge
2009-10-22 13:10:59 -07:00
a464d46970
EXT-1651 Fix "You cannot close the Buy Land window" error message that prevents buying land more than once per login session.
...
Made LLFloaterBuyLandUI destroy itself on close, which cleans up pending currency transactions.
Changed LLViewerParcelMgr::deleteBuyInfo() signature because I found it confusing.
Reviewed with Richard.
2009-10-22 12:15:53 -07:00
e5484e56b3
EXT-1784 Server getting spammed whenever you put on a wearable
...
Made an adjustment to ignore remove requests on items that don't exist, to avoid the extra messages to the server.
Also made a couple of adjustments to ensure removal of alpha masks and tattoos along with other wearable types.
Added these code points to the wiki page detailing what modifications need to be made when adding a new wearable type:
https://wiki.lindenlab.com/wiki/User:Vir#Adding_new_wearables
Code reviewed by Seraph.
2009-10-22 18:29:52 +00:00
8f890c85c3
EXT-356 Tab Height background needs to be settable per instance
...
now we have first, middle, last tab art
reviewed by richard
2009-10-22 17:16:24 +00:00
f58857824e
Fixed Mac build breaker: failing ln -s command.
...
viewer_manifest.py has acquired new 'ln -s' commands to avoid duplicating
shared .dylib files between the main Second Life app bundle and the embedded
mac-updater and mac-crash-logger app bundles. Unfortunately, the second time I
ran with these new commands, they failed because the target already existed.
Added -f switch to make that case benign.
2009-10-22 10:40:27 -04:00
0dce9862d2
Fix broken test compile.
...
It looks as though someone tried to reactivate the skip()ped test by replacing
"google.com" with "linux.org" and deleting the skip() call. Unfortunately the
edit went wrong: the instance of "google.com" in the skip() call was replaced,
and the line declaring hostStr = "google.com" was deleted. Removing the local
hostStr variable broke the compile. (Possible merge glitch?)
On the above assumption, I commented out the skip() call, reinstated the
hostStr declaration and replaced "google.com" with "linux.org" therein.
2009-10-22 10:37:57 -04:00
4c4da8aca2
Fix the Mac and Linux build after llwearable breakage. Needed to add
...
an explicit include for LLViewerFetchedTexture because it's used for
a template specialization, and fixed LLLocalTextureObject constructor
to take a const LLUUID reference so locals can be passed.
2009-10-22 12:22:06 +01:00
eda3c6386e
Deleted some files that were deleted by PE but missed during merges.
...
Added some missing licensing info.
2009-10-22 05:54:50 +00:00
1478be6b73
Merged in my DEV-35406 crash on shutdown fix.
2009-10-21 19:21:11 -07:00
ef97fc146c
Fix for Mac build.
2009-10-22 02:16:58 +00:00
0fc5ab7f18
Workaround for DEV-35406 lleventhost crash on shutdown.
...
The fix deletes all LLEventPumps boost::signal objects prior to unloading any dlls.
reviewed by Nat.
2009-10-21 19:08:25 -07:00
642d368ecc
merge
2009-10-21 18:49:19 -07:00
e25395e10f
merge
2009-10-21 18:06:25 -07:00
0f121ca6b8
DEV-41615 DEV-41615 Add symlinks to updater and crash logger app bundles to fix dylib refs.\nllcommon, apr and expat dylibs were missing from the crash logger and updater, instead of shipping extra copies were using relative pathed symlinks to the copies in the Second Life.app/Contents/Resources folder.
2009-10-21 17:59:35 -07:00
c1583be773
Fix for DEV-41542 (hitting Tab at google login on MoaP inserts a character into the password field).
...
Moved some special-case handling from LLMediaCtrl::handleKeyHere/handleUnicodeCharHere to LLViewerMediaImpl::handleKeyHere/handleUnicodeCharHere so that the key handling for LLViewerMediaFocus gets the benefit of it as well.
2009-10-21 17:34:07 -07:00
c7786aa5b6
Merging revisions 2146-2150 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
...
* Bugs: EXT-1752 EXT-1754
2009-10-22 00:25:11 +00:00
0041d485b1
Merging revisions 2129-2144 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0-3, respecting ancestry
...
* Bugs: EXT-1293 EXT-1611 EXT-1613 EXT-1176 EXT-1724 EXT-1186 EXT-1662 EXT-1760 EXT-1720
* Dev: EXT-1575 EXT-1770 EXT-1232 EXT-1234
2009-10-22 00:21:18 +00:00
67c4555a37
svn merge -r136533:136919 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-14 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
...
* Bugs: EXT-1779
2009-10-21 23:08:48 +00:00
7034a4ef9b
DEV-41600: one last change: rename INTERACT and CONTROl to MEDIA_PERM_INTERACT and MEDIA_PERM_CONTROL
2009-10-21 14:54:43 -07:00
5cb2371781
converted LLToast::Params to be a param block
...
reviewed by James
2009-10-21 21:53:06 +00:00
7813c18f34
selected inventory item no longer renders double box
...
reviewed by James
2009-10-21 21:50:26 +00:00
54517fc696
DEV-41600 Refactored my previous change based on review feedback from monroe
2009-10-21 14:43:00 -07:00
5164ed388c
Code audit for r136515 ("merging in new wearable infrastructure...")
...
No expected functionality change; this mostly contains cosmetic cleanup.
Reviewed by: Nyx
2009-10-21 21:37:27 +00:00
b3d1eb82fa
fix for chat history layout bugs
...
EXT-1728 - there is no new line in the text copied on junction of 2 panels
EXT-1670 - fix chat history use of widgets
reviewed by James
2009-10-21 21:30:40 +00:00
Nat Goodspeed