Commit Graph

13747 Commits (cf64ecb41dbbdcdc3c512510c4a7ebd28c832314)

Author SHA1 Message Date
Andrew Meadows cf64ecb41d Adding group owned check for enabling returnability of objects on parcels. 2011-01-07 15:20:11 -08:00
Andrew Meadows e040f16a4f merge 2010-12-10 10:40:38 -08:00
Andrew Meadows dd8e387d66 ER-343 viewer UI does not correctly enable/disable object return
The problem: a misunderstanding of what LLViewerParcelOverlay::isOwned() means.
2010-12-06 15:47:35 -08:00
Oz Linden 02701073ce increment viewer version number to 2.5 2010-11-22 09:53:01 -05:00
Kent Quirk 93a8da6c22 tag for 2.4 first beta 2010-11-21 20:48:03 -05:00
brad kittenbrink ef07a4b239 Merge 2010-11-19 17:47:31 -08:00
brad kittenbrink 870773ec17 Fix for viewer_manifest.py failure on windows. 2010-11-19 17:44:59 -08:00
Leyla Farazha 7e8929ad53 Merge 2010-11-19 16:14:15 -08:00
Leyla Farazha 7a74f64d5e Merge 2010-11-19 16:13:51 -08:00
Leyla Farazha b48dad1726 DN-199 Modify LLGetDisplayName tooltip 2010-11-19 16:12:26 -08:00
Bill Curtis d92608f1dc Automated merge with http://bitbucket.org/lindenlab/viewer-development 2010-11-19 15:58:35 -08:00
brad kittenbrink 9d3174c038 Merge. 2010-11-19 15:54:42 -08:00
brad kittenbrink a062c73ff4 Fix for windows installer missing update_install.bat. Paired with mani. 2010-11-19 15:54:03 -08:00
brad kittenbrink fd78866bcd Merged latest lindenlab/viewer-development with mani_linden/viewer-development 2010-11-19 15:40:05 -08:00
Mark Palange (Mani) 0778bf9152 Updated execute permissions on linux install script 2010-11-19 14:33:09 -08:00
Bill Curtis 066d8c39ca Automated merge with file:///Users/Bill/Projects/viewer-release 2010-11-19 14:11:42 -08:00
Oz Linden 3337ef16ce Automated merge with file:///Users/oz/Work/viewer-development 2010-11-19 17:03:05 -05:00
Bill Curtis cb8b30864f fixed typo 2010-11-19 14:01:30 -08:00
Nat Goodspeed 8b079f38c6 Automated merge with https://bitbucket.org/mani_linden/viewer-development 2010-11-19 17:00:27 -05:00
Nat Goodspeed b9d9a84f74 Fix test failure due to erroneous validation of fputs() return value. 2010-11-19 16:59:28 -05:00
Dave SIMmONs 2eec4949cc Merge latest from lindenlab/viewer-development 2010-11-19 13:22:07 -08:00
Oz Linden f6ba55b8ed merge fix for STORM-138 2010-11-19 15:58:53 -05:00
Oz Linden 0f72f152e8 merge fix for STORM-616 2010-11-19 15:52:52 -05:00
Oz Linden 1630bd4149 merge fix for STORM-560 2010-11-19 15:51:12 -05:00
Oz Linden bf5e9b8374 merge fix for STORM-584 2010-11-19 15:50:07 -05:00
Oz Linden 025db4bab7 merge additional fixes for STORM-572 2010-11-19 15:44:32 -05:00
Oz Linden 7f48809a74 merge fix for STORM-189 2010-11-19 15:40:42 -05:00
Jonathan Yap daae74e569 Changed Sit Down shortcut definition and reordered menu slightly. 2010-11-19 15:35:24 -05:00
brad kittenbrink b6edd74775 Merged latest lindenlab/viewer-development with mani_linden/viewer-development for bacground updater work. 2010-11-19 12:09:18 -08:00
Andrew A. de Laix 8d21105a8c dull boring notification message. 2010-11-19 12:04:01 -08:00
Andrew Meadows c320b2cef9 Fixing a typo that broke the build. 2010-11-19 08:36:53 -08:00
Seth ProductEngine c68d6c794c STORM-584 FIXED color setting to apply to bubble chat text. 2010-11-19 16:50:10 +02:00
Oz Linden 1139584b02 merge head for storm-102 branch 2010-11-19 09:32:38 -05:00
Andrew Productengine edd1db2956 STORM-572 ADDITIONAL_FIX Fixed overlappings in Sound & Media tab of Preferences.
Changed xml to fix overlappings in Spanish locale and make panel closer to spec.
2010-11-19 14:41:01 +02:00
Mark Palange (Mani) 8c2026d6b7 CHOP-135 Bug fixes. 2010-11-18 21:57:27 -08:00
Mark Palange (Mani) e19ee531ae merge 2010-11-18 17:03:40 -08:00
Mark Palange (Mani) c893c55d8a Fixing bugs discovered in merge with viewer development 2010-11-18 17:03:01 -08:00
Oz Linden d67c395800 merge fix for STORM-654 2010-11-18 18:57:52 -05:00
Andrew Meadows 424786d8d0 Added viewer-side "object overlaps parcel" check encroachment returnabilty UI
Reviewed with Falcon
2010-11-18 15:55:53 -08:00
Oz Linden d701824c0b merge fix for STORM-316 2010-11-18 18:46:36 -05:00
Oz Linden f735f8d978 merge fix for STORM-576 2010-11-18 18:44:47 -05:00
Andrew A. de Laix cd30239eda Automated merge with https://bitbucket.org/mani_linden/viewer-development/ 2010-11-18 15:40:36 -08:00
Andrew A. de Laix 86e84a1313 conform to coding standard. 2010-11-18 15:40:21 -08:00
Mark Palange (Mani) 6802775bc4 Merge with viewer-development 2010-11-18 15:36:11 -08:00
Wolfpup Lowenhar 3eb3198248 STORM-654 : Person to Person chat logs are not created if Display Names are off
Modified code in indicated changeset to correct problem after consulting with
 Leyla Linden who sugested the orginal change. This fix will convert the Legacy
 name to a user name id not useing Display Names.
2010-11-18 18:30:00 -05:00
brad kittenbrink 0e52564f0a Fix for mac build error. 2010-11-18 15:11:42 -08:00
Mark Palange (Mani) c6f3b275b0 Automated merge with http://bitbucket.org/mani_linden/viewer-development 2010-11-18 14:49:14 -08:00
Mark Palange (Mani) a5e3ac21b4 CHOP-187 Fixed linux updater return code to return 0 on success 2010-11-18 14:49:03 -08:00
Dessie Linden 327a922dc9 merged 2.3.0-release tag from viewer-release 2010-11-18 14:35:41 -08:00
eli_linden cbacbdd883 CT-633 WIP FR linguistic 2010-11-18 14:12:50 -08:00