Aimee Linden
a330399082
VWR-17653 (SNOW-734) FIXED Show inspectors for avatars on the MiniMap
...
Imported from Snowglobe.
2010-09-01 14:22:38 +01:00
Aimee Linden
2b5cfc2a4d
VWR-13221 (SNOW-188) FIXED Allow panning of the minimap
...
Imported from Snowglobe.
2010-09-01 14:14:35 +01:00
Eli Linden
3cabca8df6
CT-575 WIP FR linguistic; restore 1 missing string
2010-08-31 13:46:13 -07:00
Eli Linden
34b0451806
CT-575 WIP FR linguistic
2010-08-31 13:37:30 -07:00
Oz Linden
49952f1d78
set default build notices to show changes since last_sprint tag
2010-08-31 14:53:28 -04:00
Oz Linden
c24db314e5
integrate up to latest viewer-development
2010-08-31 14:16:25 -04:00
Oz Linden
049f0e1f95
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2010-08-31 12:58:41 -04:00
Oz Linden
4d3cb398db
Added tag last_sprint for changeset c6e6324f5be1
2010-08-31 12:57:48 -04:00
Tofu Linden
93b2f1a039
VWR-22162 FIXED 'I can't add negative signs to TWIST in Edit Mode'
...
Probably a regression from the prevalidator rework - was enforcing non-negative int when precision=0 (i.e. non-float), should have been enforcing only full int range.
2010-08-31 17:18:27 +01:00
Oz Linden
b81d5d9285
pull internationalization fixes from faulty split
2010-08-30 22:58:56 -04:00
Aimee Linden
0d144b0a99
Fix double definition of create_jump_keys="true" introduced in the fix for VWR-20724 to pass coding policy check.
2010-08-31 01:07:48 +01:00
Aimee Linden
788a5bc4f5
Merge
2010-08-31 01:06:26 +01:00
Oz Linden
d84c6625c7
Automated merge with http://bitbucket.org/aleric/viewer-development-aleric-export
2010-08-30 06:38:44 -04:00
Oz Linden
b0bf8b9619
add parameters for an oz_viewer-review2 build
2010-08-29 17:22:47 -04:00
Oz Linden
50b1311654
pull changes for EXT-8668 and EXT-7901
2010-08-29 17:19:20 -04:00
Oz Linden
f2353797e2
merge up to latest viewer-development
2010-08-29 08:41:50 -04:00
Oz Linden
05913a83a5
Merge changes from product-engine branch
2010-08-29 08:38:34 -04:00
Monroe Linden
bef304c0a3
Removing two extraneous entries from viewer-hg-convert.shamap.
2010-08-27 16:54:41 -07:00
Aimee Linden
53adc03c8d
Reconstructed viewer-hg-convert.shamap for the viewer-public merge
2010-08-27 21:57:33 +01:00
Tofu Linden
c722590d15
merge
2010-08-27 18:15:42 +01:00
Merov Linden
43eb195633
Pull cg's BuildParams fixes
2010-08-27 09:59:10 -07:00
Merov Linden
c9631e6112
Sync with viewer-development
2010-08-27 09:26:52 -07:00
Christian Goetze (CG)
2777ccc1c9
Clean up Comments in BuildParams; Replace explicit upload locations with "public_build" policy.
2010-08-27 09:06:09 -07:00
Aleric Inglewood
c4acbaf7c4
SNOW-766: Add a 'printbuilddirs' command to develop.py
2010-08-27 17:32:41 +02:00
Merov Linden
3c8089b0fe
Sync with viewer-development
2010-08-27 07:52:53 -07:00
Merov Linden
dbe965eaa1
Sync with viewer-development
2010-08-26 21:45:20 -07:00
Merov Linden
9d880615d1
VWR-20946 : fix erroneous error message (broken window...)
2010-08-26 20:37:54 -07:00
Merov Linden
63053aad8f
VWR-20946 : fix the viewer manifest script to take the new kdu lib name into account
2010-08-26 20:30:10 -07:00
Merov Linden
7869a17f76
VWR-20946 : use fixed linux bundle for kdu
2010-08-26 15:31:57 -07:00
Aimee Linden
e43976f54d
Remove redundant panel_classified.xml XUI file.
2010-08-26 20:56:44 +01:00
Oz Linden
838c01e87d
re-merge change from Thickbrick (minor collisions with changes from viewer-public merge)
2010-08-26 14:34:50 -04:00
Vadim Savchuk
75a66a146b
EXT-8727 FIXED Potential fix for a crash in LLAppearanceMgr::updateClothingOrderingInfo.
...
I couldn't reproduce the problem (it has happened for only two users, both running MacOSX),
but from what I see in the logs, it might have been caused by (or related to) NULL COF items.
I haven't found out how they appear nor what exactly causes the crash, but just for any
case I added a check to make sure we don't try to update wearables ordering info for such items.
Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/876/
--HG--
branch : product-engine
2010-08-26 18:59:08 +03:00
Vadim Savchuk
19fb0a1669
Manual merge from default branch
...
--HG--
branch : product-engine
2010-08-26 16:52:32 +03:00
Tofu Linden
1a8d917a6d
lame-but-effective workaround for self-editing UI bug, until the right fix is ready.
2010-08-26 13:09:55 +01:00
Tofu Linden
a1d010293d
re-merge viewer-public. has a rough edge or two, but this is closer to the snowglobe2.1 and viewer2.2 code, and beats people re-applying their viewer-public changes piecemeal while waiting for this to land.
2010-08-26 12:28:04 +01:00
Lynx Linden
d18b3d2aff
EXT-7901 FIXED: Follow up fix to remove short-term hack.
...
As advertized, I have removed the short-term hack that I put in place
to make release note URLs work. I have now put in place a more general
and correct solution. The key observeration from Roxie is that SLE
SLurls should have the same hostname as the grid host. So now, URLs
like http://google.com/app are no longer categorized as a SLurl and
produce errors when you click on them.
2010-08-26 09:27:22 +01:00
Merov Linden
3862dcd51b
Sync with viewer-development
2010-08-25 11:13:30 -07:00
Merov Linden
6ed1822753
Sync with viewer-development
2010-08-25 11:11:58 -07:00
Merov Linden
5361e6826f
VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patch
2010-08-25 10:58:49 -07:00
Tofu Linden
1d89a80ba7
merge
2010-08-25 15:58:08 +01:00
Vadim Savchuk
8e56f06392
Merge from default branch
...
--HG--
branch : product-engine
2010-08-25 17:08:42 +03:00
Aimee Linden
6fcde580c3
Merge
2010-08-25 11:08:49 +01:00
Nat Goodspeed
598781af08
Update GLSL shader sources to current $LicenseInfo$ standard.
...
See https://wiki.lindenlab.com/wiki/License_Substitution for details.
2010-08-24 20:21:44 -04:00
Aimee Linden
9a44da73d7
Merge
2010-08-25 01:20:58 +01:00
Aimee Linden
97b3314200
EXT-8398/EXT-8300 FIXED Avatar icons displaced from SLURL profile links
...
Icon was being inserted before any text preceding the link.
Reviewed by Richard.
2010-08-25 01:19:44 +01:00
Aimee Linden
06148d602e
BuildParams - Use new 'build_debug_release_separately' flag for viewer-development
2010-08-25 01:12:19 +01:00
Mark Palange (Mani)
c7ac420978
merge
2010-08-24 16:13:26 -07:00
Mark Palange (Mani)
d02b972ae7
merge
2010-08-24 15:45:21 -07:00
Merov Linden
b3e10e872f
Suppress llkdu target on Windows build, re-enable manifest check for llkdu.dll
2010-08-24 15:40:49 -07:00
Merov Linden
1de433aa8c
Sync with viewer-development
2010-08-24 12:44:02 -07:00