084cee21ca
automated merge
2010-10-15 15:01:59 -07:00
6fc3de7b2d
Merge
2010-10-15 13:36:10 -07:00
f34dbf937d
automated merge
2010-10-15 13:35:57 -07:00
b0fd7bf7ea
fixing ims not logging with display names off
2010-10-15 13:32:31 -07:00
8766f321d8
automated merge
2010-10-15 11:31:39 -07:00
8158c5637a
Automated merge with file:///Users/oz/Work/viewer-development
2010-10-15 08:37:31 -04:00
508686047d
Merge from http://hg.secondlife.com/viewer-identity (display names)
2010-10-14 14:03:16 -07:00
f53f6f20df
DN-174Some length of Display Name (username) can cause the name to disappear off of the Buy object floater
2010-10-14 13:20:43 -07:00
952340c227
merge up to latest viewer-development
2010-10-14 15:52:11 -04:00
b049db546a
DN-177 Cannot click on Name in Friend Request to view profile - and no profile pic in friend request
2010-10-14 12:01:40 -07:00
d4361230cd
automated merge
2010-10-14 12:00:27 -07:00
2303ec6213
merge fix for STORM-367
2010-10-14 14:16:35 -04:00
ac3f7c2b6b
Automated merge with file:///Users/oz/Work/viewer-beta
2010-10-14 14:13:30 -04:00
1bd19e8ffe
merge
2010-10-14 13:03:19 +03:00
4659648598
STORM-381 FIXED Restored ability to join/create group from People tab > My Groups.
...
Backing out changeset fe6c8e0a4a23 (which was made to fix STORM-263).
We'll examine and fix the faulty changes.
2010-10-14 12:34:28 +03:00
a486319bd0
fix issue with last merge due to trusted browser changes
2010-10-13 18:07:33 -07:00
330ea83c3d
making profiles look nicer when display names isn't on
2010-10-13 15:39:16 -07:00
84f06e40e1
DN-165 User cannot reset name to default if they are throttled because they receive the Sorry you cannot change your display name until [time] message. They cannot access the change display name dialog to hit reset when throttled.
2010-10-13 14:36:01 -07:00
0957d94baa
DN-170 Info icon covers name in Inventory > Properties view in side panel
...
DN-171 Landmark > More information panel can have name information clipped off for creator and owner
2010-11-12 16:03:35 -08:00
7ea2a1f9cc
Added tag 2.2.0-beta3 for changeset b0cd7e150009
2010-10-13 14:14:13 -07:00
2f9da36712
automated merge
2010-10-13 12:37:12 -07:00
c7c43d83f8
merge fix for STORM-196
2010-10-13 15:16:00 -04:00
8127136855
merge fix for STORM-304
2010-10-13 14:59:29 -04:00
7bb74afb67
Automated merge with ssh://bitbucket.org/merov_linden/viewer-development-storm-137
2010-10-13 10:53:10 -04:00
7cb3a6bca8
STORM-196 FIXED 'Undo changes' button is absent on 'Edit wearable' panel
...
-Added "top" parameter to the button to put button in visible area
-Added "left_pad" and changed "width" parameters for proper positioning inside layout_panel
2010-10-13 15:31:16 +03:00
17a04f8231
EVE-47 - Event formatting should appear in "Profile" window
...
EVE-74 - Change in-viewer support for 'notify me' to be maintainable via app slurl
EVE-72 - Modify viewer to make the event profile window be an html control
This is basically a reworking of the event profile display to remove all in-viewer
specific event display rendering, in preparation for richtext descriptions.
Most was removal of code.
2010-10-12 17:49:36 -07:00
d3422c8d9e
Merge
2010-10-12 15:52:03 -07:00
93d31d9bfe
merge fixes for STORM-374
2010-10-12 17:32:56 -04:00
aae37202f1
ECC-10 FIXED Antialiasing is broken
...
Updated default RenderUseFBO setting to "TRUE" in settings.xml.
2010-10-12 17:31:18 -04:00
e1bd35de10
Automated merge up from viewer-beta
2010-10-12 17:06:13 -04:00
7b2b23c2b0
SH-319 FIXED Anti-aliasing enable/disable not preserved correctly when cancel out of preferences
...
Added RenderUseFBO to list of parameters to be restored upon preference dialog cancel.
2010-10-12 17:05:36 -04:00
a351c5005e
Pull update from viewer-development
2010-10-12 13:51:41 -07:00
8964526bea
Added tag 2.2.0-beta4 for changeset 00a831292231
2010-10-12 13:50:42 -07:00
f1335361ec
ECC-10 FIXED Antialiasing is broken
...
Updated some legacy files to correspond to default settings.
2010-10-12 16:47:53 -04:00
52d2906943
Added tag 2.2.0-beta3 for changeset b0cd7e150009
2010-10-12 12:49:00 -07:00
0f7ca61386
Merge
2010-10-12 10:46:47 -07:00
f1c41c7945
DN-120 "As a Viewer Developer, I want to update general preferences, so that "Show Display Names" appears less intrusive"
...
DN-160 View Display Names Preference extends below border in preference
2010-10-12 10:22:52 -07:00
def038f007
DN-164 Edit Partner link not active in Edit Profile Panel
2010-10-12 10:20:17 -07:00
5623139806
STORM-263 : merge to viewer-beta
2010-10-12 10:00:36 -07:00
f36085b0de
merged SNOW-756 / VWR-23385 / STORM-374 (fixed standalone LD_LIBRARY_PATH for unit tests)
2010-10-12 17:26:50 +02:00
8269d4d51c
pull fixes for STORM-368 (enable LL_TESTS on all tests)
2010-10-12 10:59:43 -04:00
28d8612cf7
merge up to latest viewer-development
2010-10-12 10:58:42 -04:00
3f43a36d34
merge fixes for VWR-23296
2010-10-12 08:47:26 -04:00
7111a1b3d9
STORM-359 FIXED Disable higlighting URLs in object names inside llDialog/llGiveInventory/llLoadURL and script question dialogs.
2010-10-12 14:05:13 +03:00
be340c9fe9
STORM-360 FIXED Disabled higlighting of URLs in object names inside IM well window.
2010-10-12 13:40:18 +03:00
bf699333fa
STORM-358 FIXED Disabled higlighting URLs in object names inside nearby chat toasts.
2010-10-12 13:31:19 +03:00
8b55caf976
merged SNOW-654: Added missing "if (LL_TESTS)" in indra/CMakeLists.txt
2010-10-12 10:15:29 +02:00
11996e9dd7
merged SNOW-651: Added missing "if (LL_TESTS)" in indra/llplugin/slplugin/CMakeLists.txt
2010-10-12 10:14:28 +02:00
5ec1ffe5a3
Allow the passing of addational fmod lib names via FMOD_NAMES from the build envorment. This will allow one to pass via command line custom fmod lib names. ie: -DFMOD_NAMES:STRING:"fmod-4.44"
2010-10-12 00:58:23 -04:00
54065ab2f9
Clean up and rework FMOD.cmake and FindFMOD.cmake
...
FMOD.cmake:
Move include(Prebuilt) to prebuilt section. It is only used for prebuilt anyway.
set(FMOD_FIND_REQUIRED ON) due to FMOD variable is use elsewhere in cmake files. This behaviour is the same as openal.
Remove redudent error messages and code due to above.
Rework the logic to be more cleaner.
Clean up whitespace.
FindFMOD.cmake
Remove redudent paths as cmake allready uses them as default. Use PATH_SUFFIXES instead.
The above will result in cmake looking in a lot more places and can handle custom build setups better.
Change FMOD to FMOD_FOUND. FMOD should not be change withen cmake.
Whitespace cleanup.
2010-10-12 00:48:27 -04:00
Roxie Linden