Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Vadim Savchuk 5725b04b08 Merge from default branch
--HG--
branch : product-engine
2009-11-19 16:14:19 +02:00
Mike Antipov e40c3d247f No ticket. Updated comments to conform to the doxygen style
--HG--
branch : product-engine
2009-11-19 16:03:25 +02:00
Mike Antipov ef292e6a8b Fixed major bug EXT-2620 (IM Chiclet Panel goes crazy when new IM chiclets are added (chiclet scrolling appears with no need))
- refactored algotithm of caclulating position of the first chiclet in the list when adding new one.
 - added comments for LLChicketPanel::addChiclet() & LLChicketPanel::arrange() methods

--HG--
branch : product-engine
2009-11-19 15:19:49 +02:00
Dmitry Zaporozhan 58439da4c6 Merge
--HG--
branch : product-engine
2009-11-19 12:19:11 +02:00
Alexei Arabadji 88cce61b09 related to EXT-700 '"Offer" notifications should be accessible via chiclet'
made 'FriendshipAccepted' notification show correct avatar icon;
avoided empty avatar name on 'OfferFriendship' notifiaction;
avoided creating IM session on offer from objects;

--HG--
branch : product-engine
2009-11-19 11:21:20 +02:00
angela b6ad65c04e EXT-2094 Add click-to-zoom as a one-click settable option for objects 2009-11-19 15:02:05 +08:00
Steve Bennetts 884a9887a7 Changes to IM Logging, includes preference changes 2009-11-18 21:42:27 -08:00
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
angela 6e5f529a7a branch merge 2009-11-19 11:43:47 +08:00
James Cook 7ab6dc37f8 EXT-1743 People inspectors should show Age, not Date born, fixed date math
Changed date math to correctly account for month lengths and leap years.
Extended unit test.
Review pending.
2009-11-18 19:21:09 -08:00
Steve Bennetts 7803ba8e0c merge 2009-11-18 18:11:03 -08:00
Steve Bennetts 5acb165025 Change close behavior to not end session.
* NOTE: This is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
2009-11-18 18:08:59 -08:00
Steve Bennetts ff6eea998d Change close behavior to not end session.
* NOTE: This is functional, but not ideal - it's still closing the floater; we really want to change the behavior of the X button instead.
Also made the group IM floater a little less broken.
2009-11-18 18:08:32 -08:00
Loren Shih 5b2c91598d EXT-2636 : No "fetching inventory" or other indication that inventory is loading. 2009-11-18 21:07:49 -05:00
Bryan O'Sullivan 699eac4ee3 Switch some files to Unix line endings 2009-11-18 17:52:03 -08:00
Nat Goodspeed 003cac41bc Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-18 18:16:57 -05:00
Steve Bennetts 3375a71ffb merge 2009-11-18 15:09:17 -08:00
James Cook 81eca4a782 merge 2009-11-18 15:05:04 -08:00
Nat Goodspeed 7bca43582e Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-18 17:59:42 -05:00
Loren Shih 061b8d3aa6 EXT-1916 : Places: Landmarks are not sorted in the Favorites Bar Accordion 2009-11-18 17:58:09 -05:00
Erica a05f63b989 EXT-2638 Add Close X to IM and Chat log windows 2009-11-18 14:43:30 -08:00
Steve Bennetts 2878328bb7 Renamed "close" to "end" in chiclet context menus
Removed "open" in chiclet context menus
Removed some deprecate "..."
Removed ^M from menu_viewer.xml
2009-11-18 14:39:51 -08:00
James Cook 5649faf6d9 merge 2009-11-18 14:33:09 -08:00
Steve Bennetts 5fce305bc6 merge 2009-11-18 14:30:05 -08:00
Steve Bennetts de23a4d92c Merge 2009-11-18 14:29:39 -08:00
James Cook 203490e2a0 Change /me emote formatting to pure italics, not underlined.
Review pending with Richard/Leyla
2009-11-18 14:29:01 -08:00
James Cook a46794bcff EXT-2579 Fix memory leak/bloat due to /me IRC-style emotes.
Pending review with Richard/Leyla
2009-11-18 14:27:58 -08:00
Steve Bennetts dd9f2ca5f5 Merge from product-engine 2009-11-18 14:24:41 -08:00
Loren Shih fb81795a2d merge 2009-11-18 17:20:03 -05:00
Steve Bennetts 3716d1bcf8 merge 2009-11-18 14:15:20 -08:00
Nat Goodspeed ce80f253e5 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-18 17:10:34 -05:00
Nat Goodspeed 51d5005fa3 Make failure to load lleventhost.dll when requested a fatal error.
This addresses a failure mode Mani encountered when lleventhost.dll wasn't
built. testlangs.py couldn't talk to the newly-launched viewer -- but thinking
that was because it had crashed, it went ahead and launched a whole bunch
more. This fix avoids the possibility of rogue viewer processes on an
unattended test machine.
2009-11-18 17:07:37 -05:00
Steve Bennetts efb512dc65 EXT-2644 - Add "Close Session" option to chicklet context menus 2009-11-18 14:07:35 -08:00
Loren Shih 4a38c90adb EXT-2641 : Linked gestures aren't showing up as being worn (and possibly more serious problems with linked gestures)
Gestures now properly handle link indirection.
2009-11-18 17:03:17 -05:00
Palmer becfbd2b82 Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0 2009-11-18 13:06:28 -08:00
Loren Shih 3ac552c504 merge 2009-11-18 15:30:40 -05:00
Palmer 8b56d0bece Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0 2009-11-18 12:02:04 -08:00
Palmer 6b81dfb139 Allow USE_GOOGLE_PERFTOOLS to be set to on. For memory manager
Reviewed by Bao
2009-11-18 11:59:09 -08:00
Loren Shih 5dea0791f7 EXT-2581 : Old items still display as "(worn)" even after I change outfits
Added gInventory.notifyObservers to idle callbacks so it gets triggered without explicit notifyObservers synchronization.
Added more state tracking for attachments, wearables, and links of those types, so that they're marked as changed properly.
2009-11-18 14:51:14 -05:00
Nyx (Neal Orman) 1875d5e37b EXT-2539 confirm we're not sending local texture IDs in appearance msg
created a throwaway function to temporarily set local texture IDs in the avatar
object to IMG_DEFAULT_AVATAR immediately before sending the TE message, and
restore the IDs when we're done. Will implement a more elegant solution for 2.1.
This is the least risky implementation, though it isn't elegant.

Code reviewed by Seraph
2009-11-18 14:48:05 -05:00
Rick Pasetto 522651f208 Merge with remote 2009-11-18 11:34:15 -08:00
Lis Pardi cb8d2cb0ac Automated merge with ssh://lis@hg.lindenlab.com/james/gooey 2009-11-18 13:15:32 -05:00
Lis Pardi d09de24023 ext-2633 Default Upload Permissions floater all messed up 2009-11-18 13:15:27 -05:00
James Cook bbc5c56efe merge 2009-11-18 10:04:15 -08:00
James Cook b314f9062d Nudge parabuild 2009-11-18 10:03:40 -08:00
Lis Pardi 5d73914581 ext-2629 Arrange order of satus bar to match spec 2009-11-18 13:02:08 -05:00
Sergei Litovchuk a27706ad2e Fixed normal bug EXT-2461 "Edit Landmark panel isn't resized":
- Added vertical scroll appearing for Place Profile and Landmark info panels.
- Added horizontal reshaping to avoid redundant horizontal scroll.

--HG--
branch : product-engine
2009-11-18 19:49:49 +02:00
James Cook 49ce27aa68 Fix merge conflict with button fonts, use SansSerifSmall (not bold) 2009-11-18 09:19:02 -08:00
James Cook 1a2694f92b merge 2009-11-18 09:12:54 -08:00