1590f187cf
Fixing merge borkasaurs.
2009-12-07 16:58:05 -08:00
85488f5414
Merge of viewer 2 changes
2009-12-07 16:03:56 -08:00
ee159d8e74
automated merge viewer2.0->viewer2.0
2009-12-07 13:50:30 -05:00
83fbe4a631
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-07 13:08:14 -05:00
ff7f3c348d
EXT-3124 : Add lookup for finding all linked items to an item
...
Commented this feature out since the viewer can't ask the server to change assetIDs of its inventory items.
--HG--
branch : avatar-pipeline
2009-12-07 13:06:24 -05:00
3ddd6ad286
Merge viewer 2.0 into media
2009-12-07 09:37:54 -08:00
13f1ed2740
EXT-3124 : Add lookup for finding all linked items to an item
...
EXT-3195 : Regenerat Links sometimes pairs to library items
Excluding library when repairing broken links.
Reselecting original selected broken link after repairing.
--HG--
branch : avatar-pipeline
2009-12-07 11:43:24 -05:00
1db39c97a5
EXT-3189: Fix tab order and location of Grid pulldown.
...
The (optional) Grid pulldown on the login screen is now located below
the Starting Location pulldown, rather than below the Last Name text
entry field. The tab order is also now more obvious.
2009-12-07 14:25:21 +00:00
fefb08eef5
DEV-43799: Make the search web view be 650x600.
2009-12-07 13:21:42 +00:00
23068a2e7d
automated merge avp->avp
...
--HG--
branch : avatar-pipeline
2009-12-04 20:09:20 -05:00
add459cfd2
EXT-3179 : Add ability to recover broken links
...
EXT-3168 : Add "Find Original" to InventoryPanel gear menu
Broken link recovery is still work in progress.
--HG--
branch : avatar-pipeline
2009-12-04 20:07:09 -05:00
16efeb8581
merge
...
--HG--
branch : avatar-pipeline
2009-12-04 19:01:31 -05:00
f017058345
For EXT-2845, EXT-2846: standardizing gesture context options to work like wearables and attachments
...
--HG--
branch : avatar-pipeline
2009-12-04 18:58:57 -05:00
009c62f13e
Remove gesture links from COF when gesture is deactivated
...
--HG--
branch : avatar-pipeline
2009-12-04 18:57:08 -05:00
5c01958391
For EXT-2879: uncommented web-based inventory fetch. AIS fix is in process.
...
--HG--
branch : avatar-pipeline
2009-12-04 18:55:23 -05:00
13eeba25d8
Fix some missing Doxygen comments
2009-12-04 14:37:50 -08:00
fde12f0204
DEV-43463: use fixed Boost package on Windows
2009-12-04 17:32:09 -05:00
938c51d2a4
merge to pull viewer-2 changes into avp
...
--HG--
branch : avatar-pipeline
2009-12-04 17:03:34 -05:00
01f61d4d9e
EXT-2510 wrong initial hair color
...
First try at a fix - some weirdness with when we actually should be setting
the mesh color or not. Fix is untested as the build is broken. Committing for
now so we can re-sync with viewer-2. Will be post-reviewed.
--HG--
branch : avatar-pipeline
2009-12-04 17:00:59 -05:00
be9480ab77
DEV-43463: skip() instead of commenting out lllogin_tests
2009-12-04 16:38:12 -05:00
dab659adea
merge
2009-12-04 13:29:05 -08:00
67d051e78c
Adding Doxygen comments
2009-12-04 13:28:39 -08:00
66bf4246ca
Automated merge with ssh://hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-12-04 15:42:50 -05:00
bef221e3aa
Merge
2009-12-04 11:57:11 -08:00
fa8b2135f5
merge
2009-12-04 10:56:19 -08:00
c9c9943098
automated merge viewer2.0->avp
...
--HG--
branch : avatar-pipeline
2009-12-04 13:50:32 -05:00
92a1ecd5fd
EXT-3124 : Add lookup for finding all linked items to an item
...
Filter string now highlights when doing this search.
--HG--
branch : avatar-pipeline
2009-12-04 13:44:25 -05:00
5b695ac56a
Nudge Parabuild
2009-12-04 10:29:39 -08:00
ab6134c231
Fix linux build, newline at end of file
2009-12-04 10:18:53 -08:00
9b89325cc9
EXT-3124 : Add lookup for finding all linked items to an item
...
Filter now works correctly.
Made some naming changes (e.g. setFilterType -> setFilterObjectType) so that what you choose to filter by is more explicit.
--HG--
branch : avatar-pipeline
2009-12-04 11:42:17 -05:00
29ed5c88c0
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
2009-12-04 13:23:20 +08:00
6dcdcb1911
Deleting content inside a prim from build floater deletes prim, rather than content
...
EXT-2575
2009-12-04 13:22:17 +08:00
59b4d01a0c
EXT-1640
...
Application Icon Misaligned on OSX Installer Dialog
2009-12-04 12:26:46 +08:00
71cd24b479
EXT-3124 : Add lookup for finding all linked items to an item
...
Added ability to filter by UUID. Work in progress.
--HG--
branch : avatar-pipeline
2009-12-03 21:32:03 -05:00
0f2f846a12
EXT-3125 : INFRASTRUCTURE : Cleanup LLInventoryFilter to disambiguate various filter options
...
EXT-3124 : Add lookup for finding all linked items to an item
LLInventoryFilter cleanup, including adding ability to lookup item by UUID.
--HG--
branch : avatar-pipeline
2009-12-03 20:50:21 -05:00
f9a023e69f
merge
2009-12-03 17:39:40 -08:00
26a38ab852
EXT-2954 Crash when using the mousewheel in any inventory panel
...
LLFolderView was explicitly passing scroll events back to its
parent LLScrollContainer, which it didn't need to do. It may not have
exhibited an infinite loop before due to bugs in the border width
computations for scroll rectangles. Reviewed with Leyla.
2009-12-03 17:37:10 -08:00
2d2f98c51b
Merge
2009-12-03 17:04:20 -08:00
8c6f3291d4
Automated merge with ssh://hg.lindenlab.com/james/gooey
2009-12-03 16:06:48 -08:00
3d6fa0a5f4
merge
2009-12-30 15:38:30 -08:00
58d65d58a9
EXT-2823 Find window: change default open location to the top-left of screen
...
EXT-2921 [BSI] Default location for Screenshot Floater hides expanded options off screen
reviewed by James
2009-12-30 15:34:30 -08:00
d2901ab4ce
EXT-2898 Hiding navbar and favbar is broken
...
reviewed by James
2009-12-30 15:33:34 -08:00
b119ee524a
EXT-2967 Spinner label font sizes are not rendering consistently between platforms
...
OSX isn't loading the ui_ctrl.xml file, moving font to individual widgets
reviewed by James
2009-12-30 15:14:59 -08:00
4e3f00fcad
EXT-2450 Extra column in Group panel memberlist
2009-12-03 16:06:33 -08:00
25b6b5929e
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-03 15:58:22 -08:00
275b4f5849
merge
2009-12-03 15:30:49 -08:00
2add7f7045
Added floater_test_text_editor, hooked up UI tests to login Debug menu
...
Reviewed with Leyla
2009-12-03 15:21:04 -08:00
2fe5e55f4f
Hack for EXT-2971 Letter R doesn't show when it's the last letter in a text block.
...
Add 1 pixel of padding to clipping rect computation. I think there is a deeper
problem in the font width computation code, but I don't know where. Opened EXT-3112
for the deeper issue. Reviewed with Leyla.
2009-12-03 15:20:21 -08:00
9d3968bb83
hopefully: linux libraries for colladadom (pcre, etc.)
2009-12-03 15:12:30 -08:00
3370a87ff5
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-03 14:57:20 -08:00
Palmer