Commit Graph

2875 Commits (9e53ad6111ce0e15cb10f2ffb47fee8b48d1c3db)

Author SHA1 Message Date
callum 9e53ad6111 Doh! Update the CMake file that controls drag and drop to turn it ON 2009-11-18 21:17:39 -08:00
callum 4419e367bc Add support for removing the Windows specific drag/drop code
from the codebase via a new CMake file (DragDrop.cmake).
2009-11-18 21:15:44 -08:00
callum 778005a350 Reworked IDropTarget COM interface impl - now much cleaner and doesn't crash! 2009-11-13 17:43:55 -08:00
Rick Pasetto 3dd79ad226 merge 2009-11-12 09:23:57 -08:00
James Cook 7a45dec2d5 merge 2009-11-12 08:53:20 -08:00
James Cook d6136a40b1 merge 2009-11-12 08:29:38 -08:00
Brad Payne (Vir Linden) de6ca4c5ea Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 11:20:57 -05:00
Brad Payne (Vir Linden) c8c0c51bf6 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-12 10:28:41 -05:00
Loren Shih e2a40ec0ca merge 2009-11-12 10:06:57 -05:00
Lynx Linden 95adfa4cac merge 2009-11-12 13:06:37 +00:00
Lynx Linden 40731c7eb8 DEV-2925: Remove a null char at the end of the location string. 2009-11-12 12:57:34 +00:00
Lynx Linden daefef6e66 DEV-2925: Remove support for secondlife:///app/objectim URLs.
These are no longer generated in Viewer 2.0 (instead we use
notifications to send object IMs to the user), so there's no
need to look for them in every textbox. Users can get details
on any objects spamming them via the new remote object inspector.
2009-11-12 12:43:18 +00:00
Lynx Linden 393f68c1a9 DEV-2925: Added a new remote object inspector.
This is used to display details about objects that may not be in the
current scene (the existing object inspector is tied to selection and
only works for objects in the scene). The remote inspector lets you see
the name and owner of the object. You can also teleport to the object's
location, view the location on the map, or mute the object.

I've also added more information to the notification you receive when
an object sends you an IM via llInstantMessage(). This notification now
has an "Inspect" button that brings up the remote object inspector.
2009-11-12 12:36:30 +00:00
Steve Bennetts 6524295bf0 merge 2009-11-12 00:10:29 -08:00
Steve Bennetts a7fa9c4936 Better fix for edge case where abort call to readComplete() can cause a crash. 2009-11-12 00:07:07 -08:00
callum f936f661bc Fix for DEV-42720 - media settings floater is Empty 2009-11-11 17:54:41 -08:00
Loren Shih 9b1680927f merge 2009-11-11 20:41:24 -05:00
Loren Shih bcdd3c25b6 Took out unnecessary llinfos msg from LLInventoryModel. 2009-11-11 20:21:45 -05:00
Loren Shih 067f91f8ad EXT-387 : Clean up WARNINGS - Advanced.DumpAvatarLocalTextures
Added menu callbacks in for avatar texture debug, but disabled functionality for release version.
2009-11-11 19:55:37 -05:00
James Cook 7eb8bb4ad1 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 16:36:02 -08:00
James Cook 391f423cd0 Revert global font setting for UI controls because it makes About Land crash
Apparently moving ui_ctrl to a different registry breaks our ability to
create dummy ones in code.  Reverting until I have time to investigate.
Discussed with Richard
2009-11-11 16:34:23 -08:00
Rick Pasetto 6a3e8353a7 Fix merge error (and hence build breakage :( ) 2009-11-11 16:32:54 -08:00
Rick Pasetto 4a376104f1 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 16:14:19 -08:00
Loren Shih 6bdd6eeb98 EXT-2261 : Inventory view should show default foldres (i.e. expand My Inventory) 2009-11-11 19:13:33 -05:00
Rick Pasetto bea3b937d9 Fix a potential crash if scroll button is not there 2009-11-11 16:12:25 -08:00
Rick Pasetto e3356c0695 some minor changes based on Richard's code review
Code Collab #34
2009-11-11 16:07:02 -08:00
Brad Payne (Vir Linden) 9245322706 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 18:57:12 -05:00
Monroe Linden eda34b82ee Remove references to media_panel_scroll in LLPanelPrimMediaControls::updateShape(), as it was removed from the XUI file. 2009-11-11 15:50:43 -08:00
brad kittenbrink 8519205533 Changing VC Debugger working directory to be ${CMAKE_CURRENT_SOURCE_DIR} to restore ability to edit in place xui files, shaders, etc. 2009-11-11 18:49:32 -05:00
Brad Payne (Vir Linden) 4f3d32f5c7 Believe this fixes the remaining issues with missing attachment links on first use of 2.0 - EXT-1593 and EXT-1591. 2009-11-11 18:23:54 -05:00
Loren Shih 2117b096d7 EXT-2377 : Add XML switch to showing either menubar or gear menu
Reverting previous checkin for enabling this.  This is more complicated than worth spending time on, at the moment.
2009-11-11 18:13:43 -05:00
James Cook afb49ed36e Fix bad XML causing UI images not to load. 2009-11-11 15:09:28 -08:00
Rick Pasetto 9fe4b5a3c1 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 15:08:22 -08:00
Rick Pasetto d023672e59 Add ToolTip functionality to LLScrollListCell
This change enables a user to set a custom tool tip on a particular
scroll list cell by calling setToolTip().  Then, this tool tip is
used.  If this is not done, the existing tooltip functionality is left
alone.

Reviewed by Richard
2009-11-11 15:08:00 -08:00
Steve Bennetts 064c91ae52 Merge from product-engine 2009-11-11 14:56:51 -08:00
Lynx Linden 6b14f9a48f DEV-41358: Changed format of preferred maturity for search.
Now preferred maturity is passed to the search web pages as an
r={13|21|42} query param.
2009-11-11 22:42:25 +00:00
Nyx (Neal Orman) 310ce55275 merge: pulling changes from trunk 2009-11-11 17:28:51 -05:00
Nyx (Neal Orman) a24c4af67d fixing build - last commit had bad call to startAppearanceAnimation
function definition of startAppearanceAnimation chagned - last patch
missed eliminating the parameters at line 6594 in llvoavatar.cpp.
This patch fixes the issue, confirmed builds and runs locally.
2009-11-11 17:25:03 -05:00
Justin C. Rounds (Chuck) 2392cb2a6a Fixed typo.
http://jira.secondlife.com/browse/EXT-2359
2009-11-11 17:21:47 -05:00
Justin C. Rounds (Chuck) f59fce8582 Automated merge with ssh://chuck@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 17:18:38 -05:00
Justin C. Rounds (Chuck) 20c9b13df6 Added tool-tip graphic. 2009-11-11 17:17:41 -05:00
Nyx (Neal Orman) bc5096ff3d DEV-34507 too many baked texture uploads
Fixed a double-bake bug on hitting the "OK" button of the appearance editor
Also cleaned up extraneous calls to requestLayersetUpload.
Behavior should now be consistent with resident expectations.

Code reviewed by Bigpapi
2009-11-11 16:40:15 -05:00
Nyx (Neal Orman) f6406b7174 EXT-2173 use of visual param animation inconsistent at best
removed ambiguous parameter "set_by_user" from many places in codebase,
renaming it to be upload_bake, which is a more accurate descriptor.
This allowed me to see several inconsistencies in how this variable was
being set - these errors were also fixed. User-visible result should be
that baked textures are not reuploaded on changing avatar sex until the
save button is pressed. primary win here is code clarity.

Code reviewed by Bigpapi.
2009-11-11 16:37:59 -05:00
Vadim Savchuk b4e3d34791 Merge from default branch
--HG--
branch : product-engine
2009-11-11 23:18:49 +02:00
richard b7740ee0c5 unbreak build 2009-11-11 13:06:14 -08:00
Vadim Savchuk db3991ca23 Merge from default branch
--HG--
branch : product-engine
2009-11-11 22:55:32 +02:00
richard b34ee7f9f4 merge 2009-11-11 12:21:23 -08:00
richard 0a095bdaed added stylized text to tooltips for showxuinames 2009-11-11 12:19:54 -08:00
richard fedf86c216 fix wrapping of text segment containing multiple newlines and ending on a newline
reviewed by leyla
2009-11-11 12:01:57 -08:00
richard 854e2eaf9a added viewports to LLRenderTarget to speed up animation of sidetray
reviewed by Leyla
2009-11-11 12:01:17 -08:00