Commit Graph

14823 Commits (6687dbe65df5a5d11711453071a482d8f88fa550)

Author SHA1 Message Date
Kitty Barnett 6687dbe65d Merged with default tip (Revision 4dede9ae1ec7)
--HG--
branch : Viewer-Build
2011-03-05 17:23:09 +01:00
Merov Linden 22198656b7 Added tag 2.5.1-start for changeset 63a6aedfce78 2011-03-01 15:46:03 -08:00
Merov Linden 268f528ca1 Set the version to 2.5.1... Yeap! Back from 2.7.0 (not a misprint) 2011-03-01 15:45:43 -08:00
Merov Linden 0748420c94 STORM-1004 : pull into viewer-development 2011-03-01 15:24:52 -08:00
Merov Linden 2ef66a7cfa STORM-954 : pull into viewer-development 2011-03-01 12:02:14 -08:00
Merov Linden 760f6f494e STORM-949 : pull into viewer-development 2011-03-01 11:59:46 -08:00
Merov Linden 0a974abcff STORM-889 : pull into viewer-development 2011-03-01 11:58:12 -08:00
Merov Linden 270f3afad4 STORM-842 : pull into viewer-development 2011-03-01 11:56:21 -08:00
Merov Linden 05546dfa3b STORM-665 : pull into viewer-development 2011-03-01 11:55:08 -08:00
Merov Linden 4e3068fcd4 STORM-1024 : pull into viewer-development 2011-03-01 11:53:47 -08:00
Merov Linden f86e112556 STORM-977 : pull into viewer-development 2011-03-01 11:50:12 -08:00
Merov Linden 9962560f57 STORM-980 : pull into viewer-development 2011-02-25 15:44:38 -08:00
Merov Linden 8976c93b5c STORM-974 : pull into viewer-development 2011-02-25 15:42:07 -08:00
Merov Linden 12f4e55fc0 STORM-680 : pull into viewer-development 2011-02-25 15:40:32 -08:00
Merov Linden b9c6c9d273 STORM-979 : pull into viewer-development 2011-02-25 15:39:01 -08:00
Merov Linden 0a397313f5 Fix llhost integration test: replaced linux.org by lindenlab.com in the DNS lookup test as linux.org was not being resolved as expected 2011-02-25 15:32:58 -08:00
Paul ProductEngine c3ae164328 STOMR-665 FIXED User is not able to view full name of Group's founder in the Group Profile
- Made text box and its panel follow right
2011-02-24 16:27:12 +02:00
Xiaohong Bao 609c70eb5a separate vertex buffer and index buffer when map/unmap VBO. can be treated as part of STORM-1011.
reviewed by davep.
2011-02-23 11:41:13 -07:00
Xiaohong Bao e216fabde0 Automated merge with http://hg.secondlife.com/viewer-development 2011-02-22 13:29:22 -07:00
Xiaohong Bao 2ebcf802cb set "RenderVBOMappingDisable" to be true by default to stop VBO memory leaking. 2011-02-22 13:28:48 -07:00
Xiaohong Bao 417069f152 more fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-22 11:22:50 -07:00
Paul ProductEngine 776dde83ed STORM-889 FIXED Put Link/Unlink in Edit Panel
- Moved callbacks for Link/Unlink to the LLSelectMgr

- Binded Link/Unlink callbacks with buttons in Build Floater

- Replaced view_listener_t usage for Link, Unlink, EnableLink, EnableUnlink with boost::bind
2011-02-22 15:24:55 +02:00
paul_productengine 23717a0918 BUG STORM-1004 FIXED Unblocking/blocking name sometimes deletes identically named entry, but of different TYPE
LLMuteList stores muted objects in two sets: set of names and set of ids. Avatar objects are stored by ids (set of ids), other objects can be stored both by name(set of names) or ids

- Delete items from corresponding set (from set of names or ids), not form both sets at time.

- Improved isMuted method's logic. Now if avatar is tested whether it's muted or not, don't search its name in the set of names.
2011-02-18 15:28:38 +02:00
Seth ProductEngine 40b50442bf STORM-842 FIXED displaying favorites list at login screen when user name is typed like "firstname.lastname" or "firstname_lastname" or user name consists of a single word. 2011-02-17 22:10:57 +02:00
Oz Linden 1a79aeca54 merge changes for storm-937 2011-02-17 15:09:50 -05:00
Oz Linden eacd9d5d59 merge changes for storm-981 2011-02-16 15:52:05 -05:00
Jonathan Yap 55b0c6d6a7 STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used 2011-02-16 14:29:23 -05:00
Xiaohong Bao ff5e3f5c2e Automated merge with http://hg.secondlife.com/viewer-development 2011-02-15 15:43:47 -07:00
Xiaohong Bao f13884e528 partial fix for SH-895/STORM-336: memory leaking. fixed vertex buffer caused leaking. 2011-02-15 14:12:58 -07:00
Twisted Laws e3f075f775 STORM-954 SL-viewer 2.0 No nearby people when over approxiamately 1000 meters 2011-02-15 14:13:43 -05:00
Andrew Meadows c28fe65252 debug_console is now resizable
Reviewed with Callum Linden.
2011-02-14 14:15:12 -08:00
Oz Linden 3555849644 bump version number to 2.7.0 2011-02-14 16:58:46 -05:00
Oz Linden 068253b2fb Added tag 2.6.0-start for changeset 92e58e51776a 2011-02-14 16:57:10 -05:00
Seth ProductEngine c7d3f93779 STORM-949 FIXED Actual usernames removed from XUI files.
Actual usernames are replaced with "TestString PleaseIgnore" in EN locale with setting translate="false" flag for affected widgets.
Translated phrases with actual usernames are removed from XUI files in other locales.
2011-02-14 21:11:11 +02:00
Kitty Barnett bef872e109 Updated patch branch dependency
--HG--
branch : Viewer-Build
2011-02-14 15:38:39 +01:00
Kitty Barnett d36c14659c - internal : reviewed for SL-2.5.0
--HG--
branch : Viewer-Build
2011-02-14 13:41:50 +01:00
Kitty Barnett befdb570c7 Merged with default tip (Revision e5176946eb04)
--HG--
branch : Viewer-Build
2011-02-14 13:36:48 +01:00
Merov Linden e15b543dd6 STORM-975 : pull into viewer-development 2011-02-11 17:42:37 -08:00
Merov Linden 58d8b666c2 STORM-833 : pull into viewer-development 2011-02-11 17:40:48 -08:00
Merov Linden 10cf492ef1 STORM-937 : Use subprocess instead os commands in python, suppress crufty svn code 2011-02-11 16:56:28 -08:00
Oz Linden 924be3f25c pull back release tag from viewer-beta 2011-02-11 11:38:27 -05:00
Dessie Linden 40abc0fe1e Added tag 2.5.0-release, DRTVWR-31_2.5.0-release for changeset b723921b5c71 2011-02-11 08:08:00 -08:00
paul_productengine 90c9b9e9c5 STORM-680 FIXED (Avaline callers are added to the Recent list)
- When accepting an avaline call, add a caller to the recent list as AvalineListItem

- When adding item to the LLRecentPeople, check whether item with the same phone number exists and delete it if exists. This is need to avoid duplication in the Recent list of the panel People.
2011-02-11 13:49:10 +02:00
Jonathan Yap 355d6d1f79 STORM-980 Appearance panel / Wear button is too wide 2011-02-11 05:17:05 -05:00
Boroondas Gupte 1d00010207 OPEN-29 Cleanup: strip trailing whitespace
As people will have to rebuild half the tree anyway, because these
headers changed, we might as well prettify them a bit.
2011-02-11 02:09:20 +01:00
Boroondas Gupte 1c931920af OPEN-29 Cleanup: removed superflous "public:"
Not related, just a while-I'm-at-it thing.
2011-02-11 01:41:34 +01:00
Boroondas Gupte 627c763439 OPEN-29 Cleanup: removed extra qualification ‘LLDir_Win32::’ on member ‘getNextFileInDir’
Before OPEN-29, when lldir_win32.h would have been included when
building for Linux, GCC would error out with
	indra/llvfs/lldir_win32.h:50: error: extra qualification ‘LLDir_Win32::’ on member ‘getNextFileInDir’
which, although unintended, probably was a Good Thing (TM), as this
would have aborted the build, so that the wrong include would be
noticed. Now that we explicitly error out with a (hopefully) useful
error message, this isn't needed anymore.
2011-02-11 01:35:21 +01:00
Boroondas Gupte 29b3207fe4 OPEN-29 Error out if lldir_<platform>.h is included when building for a different platform
As far as I know, there is no good reason to include e.g.
indra/llvfs/lldir_win32.h while not building for a windows target, so be
better prevent this to avoid hard to find errors.
2011-02-11 01:27:01 +01:00
Jonathan Yap 06c1fede78 STORM-979 selection outline from inventory bottom panel buttons is cut at the left side when clicked. 2011-02-10 15:22:36 -05:00
Merov Linden 547b40bfc8 STORM-986 : Fix for Linux build 2011-02-10 11:56:06 -08:00