Commit Graph

40429 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Nyx (Neal Orman) 8066f48685 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-04 09:54:07 -05:00
Dmitry Oleshko 347f261480 implemented a normal Sub-task (EXT-988) Change indication of unread messges in chiclets
--HG--
branch : product-engine
2009-11-04 16:35:48 +02:00
David Parks 88292104d9 Fix for crash when loading some meshes.
Added button to auto-fill LODs.
2009-11-04 14:19:05 +00:00
Andrew Dyukov e634f2f42d Fixed problems caused by a160d0dfb897
--HG--
branch : product-engine
2009-11-04 16:13:47 +02:00
Mike Antipov 14af8485fd Fixed normal bug EXT-2061 ("All" list doesn't contain any friends while "Online" list isn't empty in "Friends" tab on People Panel)
- added code to force fetching of Inventory "Friends/All" folder in case it is incomplete on startup.

--HG--
branch : product-engine
2009-11-04 16:02:12 +02:00
Sergei Litovchuk 380bb0ce09 No ticket. Removed extra includes. Fixed copyright years.
--HG--
branch : product-engine
2009-11-04 15:24:11 +02:00
Sergei Litovchuk 2715e94a5a Implemented major task EXT-2054 "Hook up parcel permission icons to parcel profile":
- Added icon representation of parcel permissions to Place Profile panel.

--HG--
branch : product-engine
2009-11-04 14:33:00 +02:00
Yuri Chebotarev 6698c134b2 merge
--HG--
branch : product-engine
2009-11-04 14:26:45 +02:00
Yuri Chebotarev 8bd0c9058d fix for some group_info bugs.
EXT-1091 "Refresh" button is overlapped by "Cancel" button in "Group Profile" panel

--HG--
branch : product-engine
2009-11-04 14:25:41 +02:00
angela 91388229f7 merge 2009-11-04 20:23:30 +08:00
Lynx Linden c10a40e54e DEV-41358: corrected a minor typo in a comment and refactored some
code to avoid duplication.
2009-11-04 11:53:29 +00:00
Eugene Mutavchi 7ad6443843 Implemented normal sub-task EXT-2145 (Incorrect names of Call button on IM Control Panels)
--HG--
branch : product-engine
2009-11-04 13:45:27 +02:00
Eugene Kondrashev 459e7e2684 Implemented normal subtask EXT-1516 - Implement chiclet for ad-hoc chat.
--HG--
branch : product-engine
2009-11-04 12:54:44 +02:00
Mike Antipov 5202334de8 Fixed Windows build, broken in changeset 698ac0866792
- Made member Speaker Listeners as LLpointers in LLParticipantList

--HG--
branch : product-engine
2009-11-04 12:02:04 +02:00
Lynx Linden aa59710bf7 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-11-04 09:13:49 +00:00
Lynx Linden 068e132039 DEV-41358 DEV-41362: Get an authentication token from login.cgi and
pass this token through to the search web pages via a q= query
parameter in the search URL. This will let the search facility
determine the user's maturity and teen settings.

I also now escape the search string that the user typed in, 'cos they
could type anything.

Thanks to Mani for showing me how to get responses from login.cgi.
2009-11-04 09:12:32 +00:00
angela bf092de246 EXT-1781 selecting Freeze frame (fullscreen preview) in the snapshot tool locks out mouse-clicks when closed 2009-11-04 15:58:49 +08:00
angela 57703de351 merge 2009-11-04 14:41:32 +08:00
James Cook de0687d930 Clean up menu_login.xml debug menu
Strip out unnecessary layout=topleft
Add debug option for reg in client
Trivial, not reviewed.
2009-11-03 20:55:38 -08:00
angela 61603ca9d5 mergre 2009-11-04 12:33:52 +08:00
Xiaohong Bao 6e9fe07727 merge 2009-11-03 21:11:04 -07:00
Steve Bennetts e8afde0ed3 merge fixes. Includes a refactoring of LLParticipantList to fix compile errors on Windows. 2009-11-03 20:06:26 -08:00
angela 1190b5d9eb merge 2009-11-04 11:44:32 +08:00
Xiaohong Bao 8b4818430f merge 2009-11-03 20:34:24 -07:00
Xiaohong Bao abf77532d8 fix the bug that textuer boost level is mixed with boolean numbers. 2009-11-03 19:42:52 -07:00
Steve Bennetts 3e3ef5c53d merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/ 2009-11-03 18:19:45 -08:00
palmer@sansome-guest-196.lindenlab.com c966466635 Automated merge with ssh://palmer@hg.lindenlab.com/viewer/render-pipeline 2009-11-03 17:43:59 -08:00
palmer@sansome-guest-196.lindenlab.com c3bb2669ce fix to make build run on mac 2009-11-03 17:43:47 -08:00
Erica ce3dfcee3b EXT-2062 UI of Notice accordion in the Group Profile panel is corrupted, EXT-1528 Widen groups content to match new sidebar width 2009-11-03 17:35:07 -08:00
Palmer e77de2e955 Automated merge with ssh://palmer@hg.lindenlab.com/viewer/render-pipeline/ 2009-11-03 17:27:49 -08:00
Palmer e8eb8a86a6 Quick fix to get collada working. Will need to make collada and boost happier. 2009-11-03 17:22:01 -08:00
Loren Shih 99b9037806 EXT-2130 : XUI Cleanup
Tab/indent formatting for sidepanel_item_info

--HG--
branch : avatar-pipeline
2009-11-03 20:09:31 -05:00
Loren Shih f263d119c4 EXT-2130 : XUI cleanup
Reformatted sidepanel_inventory
Took out tab container from both sidepanel_inventory and sidepanel_item_info

--HG--
branch : avatar-pipeline
2009-11-03 19:46:57 -05:00
James Cook 16e08b2610 merge 2009-11-03 16:45:36 -08:00
James Cook fcb899be47 Missed the talk_button.xml file add. 2009-11-03 16:39:58 -08:00
Rick Pasetto 0dce13377e Fix unposted bug: potential incorrect contract in LLMediaEntry::asLLSD(LLSD& sd)
Review #26

Callum found this potential bug in LLMediaEntry::asLLSD(LLSD&). It
does not erase the incoming LLSD's WHITELIST_KEY. Every other key is
overwritten in this manner, but for the WHITELIST_KEY it is just
appended. Note that this is in code common to the server...but I do
not believe at this point that there is a bug exhibited by this.

Added unit test to test for this case.
2009-11-03 16:21:55 -08:00
James Cook a3f9b5d2d8 EXT-2093 People inspectors should include an "IM" button 2009-11-03 16:13:54 -08:00
James Cook c386169742 Removed unneeded layout="topleft" attributes. 2009-11-03 16:13:39 -08:00
Steve Bennetts 051190a955 merge 2009-11-03 16:11:00 -08:00
Steve Bennetts 16202f5e00 merge 2009-11-03 16:07:14 -08:00
brad kittenbrink f9c4682fb3 Continuing work on DEV-41724/DEV-41725 normalizing shared lib staging.
It's basically working on linux.
2009-11-03 18:35:36 -05:00
James Cook 3f622037f8 EXT-1345 Convert LLTalkButton to XUI XML
Allows Erica and co to change and localize it.
Trivial, not reviewed.
2009-11-03 15:25:03 -08:00
Xiaohong Bao 81e7193879 merge 2009-11-03 15:55:53 -07:00
Xiaohong Bao eaa1ce61b0 merge 2009-11-03 15:50:04 -07:00
James Cook 9637333708 merge 2009-11-03 14:39:55 -08:00
James Cook c86ec95232 EXT-1865 Can now set objects for sale for L$0
Trivial XUI mistake, not reviewed
2009-11-03 14:39:09 -08:00
Leyla Farazha 58578f2993 merge 2009-11-03 14:05:08 -08:00
Leyla Farazha dbaa7e28ca fixing de dot 2009-11-03 13:59:12 -08:00
James Cook bc6cd5757b merge 2009-11-03 13:55:11 -08:00
James Cook 876bb9043c Fixed strings to use our preferred <string> instead of <floater.string> 2009-11-03 13:51:11 -08:00