Commit Graph

1151 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Jonathan Yap eff712570d STORM-990 Merged from current v-d trying to resolve merge issue Oz was having 2011-02-15 16:10:21 -05: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
Tofu Buzzard ef49d3f30b merge 2011-02-14 11:31:24 -08:00
Loren Shih 547293305b Automated merge up from viewer-development into mesh-development 2011-02-14 09:57:32 -05:00
Jonathan Yap 2bd790daaa STORM-990 The arrow in the bottom right of the Landmark panel points down 2011-02-12 06:30:19 -05:00
Merov Linden e15b543dd6 STORM-975 : pull into viewer-development 2011-02-11 17:42:37 -08:00
Oz Linden 4d040e3c5d merge local changes 2011-02-11 14:06:27 -05:00
Jonathan Yap 355d6d1f79 STORM-980 Appearance panel / Wear button is too wide 2011-02-11 05:17:05 -05: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
Tofu Buzzard c3d46cf609 merge 2011-02-10 09:54:55 -08:00
Loren Shih e3ed1565f8 Automated merge up from viewer-development into mesh-development 2011-02-10 10:44:21 -05:00
Merov Linden 9aaf4b3ba7 STORM-981 : Fix Linux link issues when LL_TESTS is ON 2011-02-09 22:08:43 -08:00
Jonathan Yap 333a9b3f97 STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used 2011-02-09 10:52:12 -05:00
Merov Linden 47642e96f9 STORM-953 : pull into viewer-development 2011-02-08 22:23:32 -08:00
Merov Linden 6ba900073f STORM-955 : pull into viewer-development 2011-02-08 22:22:25 -08:00
Merov Linden 2a13dc7930 STORM-960 : pull into viewer-development 2011-02-08 22:21:15 -08:00
Jonathan Yap 979cd0300f STORM-975 forgot to update contributions.txt 2011-02-07 11:55:17 -05:00
Jonathan Yap 759eed5ef6 STORM-974 forgot to edit contributions.txt 2011-02-07 11:53:08 -05:00
Aleric Inglewood ef490e308c Introduces a LLThreadLocalData class that can be
accessed through the static LLThread::tldata().
Currently this object contains two (public) thread-local
objects: a LLAPRRootPool and a LLVolatileAPRPool.

The first is the general memory pool used by this thread
(and this thread alone), while the second is intended
for short lived memory allocations (needed for APR).
The advantages of not mixing those two is that the latter
is used most frequently, and as a result of it's nature
can be destroyed and reconstructed on a "regular" basis.

This patch adds LLAPRPool (completely replacing the old one),
which is a wrapper around apr_pool_t* and has complete
thread-safity checking.

Whenever an apr call requires memory for some resource,
a memory pool in the form of an LLAPRPool object can
be created with the same life-time as this resource;
assuring clean up of the memory no sooner, but also
not much later than the life-time of the resource
that needs the memory.

Many, many function calls and constructors had the
pool parameter simply removed (it is no longer the
concern of the developer, if you don't write code
that actually does an libapr call then you are no
longer bothered with memory pools at all).

However, I kept the notion of short-lived and
long-lived allocations alive (see my remark in
the jira here: https://jira.secondlife.com/browse/STORM-864?focusedCommentId=235356&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-235356
which requires that the LLAPRFile API needs
to allow the user to specify how long they
think a file will stay open. By choosing
'short_lived' as default for the constructor
that immediately opens a file, the number of
instances where this needs to be specified is
drastically reduced however (obviously, any
automatic LLAPRFile is short lived).

***

Addressed Boroondas remarks in https://codereview.secondlife.com/r/99/
regarding (doxygen) comments. This patch effectively only changes comments.

Includes some 'merge' stuff that ended up in llvocache.cpp
(while starting as a bug fix, now only resulting in a cleanup).

***

Added comment 'The use of apr_pool_t is OK here'.

Added this comment on every line where apr_pool_t
is correctly being used.

This should make it easier to spot (future) errors
where someone started to use apr_pool_t; you can
just grep all sources for 'apr_pool_t' and immediately
see where it's being used while LLAPRPool should
have been used.

Note that merging this patch is very easy:
If there are no other uses of apr_pool_t in the code
(one grep) and it compiles, then it will work.

***

Second Merge (needed to remove 'delete mCreationMutex'
from LLImageDecodeThread::~LLImageDecodeThread).

***

Added back #include <apr_pools.h>.

Apparently that is needed on libapr version 1.2.8.,
the version used by Linden Lab, for calls to
apr_queue_*. This is a bug in libapr (we also
include <apr_queue.h>, that is fixed in (at least) 1.3.7.

Note that 1.2.8 is VERY old. Even 1.3.x is old.

***

License fixes (GPL -> LGPL). And typo in comments.
Addresses merov's comments on the review board.

***

Added Merov's compile fixes for windows.
2011-02-05 15:58:07 +01:00
Tofu Buzzard 84645f5b59 merge 2011-02-03 09:49:14 -08:00
Loren Shih 957b8b15e1 Automated merge up from viewer-development into mesh-development 2011-02-03 10:32:05 -05:00
Jonathan Yap 38b228ad18 STORM-953 Clarify what happens when you uncheck Allow Public Access
Note: This change also incorporates STORM-960
2011-02-02 18:41:11 -05:00
Jonathan Yap df05f01fcd STORM-960 Descriptive text missing next to first checkbox in About Land/Access
Contribution team: Aleric Inglewood, Alexandrea Fride, Robin Cornelius, and Siana Gearz
2011-02-02 18:36:42 -05:00
Merov Linden dca34a56d2 STORM-435 : pull into viewer-development 2011-02-02 15:04:27 -08:00
Tofu Buzzard ce90d8f8da merge 2011-02-01 09:45:28 -08:00
Loren Shih fbc6e5d639 Automated merge up from viewer-development into mesh-development 2011-02-01 11:28:22 -05:00
Oz Linden cb6d59513e merge changes for storm-829 2011-01-31 12:32:57 -05:00
Twisted Laws 0d5b0cad14 Embed Minimap into the Nearby list of the People Sidebar 2011-01-26 19:22:42 -05:00
Loren Shih d0cba9e919 Automated merge up from viewer-development into mesh-development 2011-01-24 10:56:40 -05:00
Aleric Inglewood 295536ae98 VWR-24321: fix validation of textures that start with 00 2011-01-24 09:35:41 -05:00
Oz Linden 7a453b7c93 add missing entry in contributions.txt for VWR-24347 2011-01-21 16:20:29 -05:00
Aleric Inglewood ee6a40beb1 VWR-24519: make debugging easier by not spawning spare process 2011-01-21 16:02:38 -05:00
Aleric Inglewood 97a9211d87 VWR-24354: correct manifest dependencies to prevent parallel install problem 2011-01-21 15:48:12 -05:00
Oz Linden 790dfe7556 merge changes for storm-844 2011-01-21 15:29:40 -05:00
Oz Linden 4652e26196 merge changes for storm-869 2011-01-21 15:14:39 -05:00
Loren Shih 38f4bad925 Automated merge up from viewer-development 2011-01-21 10:36:29 -05:00
Aleric Inglewood c47ab36b20 VWR-24320: remove dump of call stack on clean exit 2011-01-20 16:01:27 -05:00
Aleric Inglewood a873ae55a3 VWR-24317: remove warning due to unassigned variable 2011-01-20 15:57:07 -05:00
Aleric Inglewood 42604a1080 VWR-24315: update cached control values when resetting debug setting to default 2011-01-20 14:35:04 -05:00
Aleric Inglewood 80d7432ce6 VWR-13040 - clean up LLObjectSelection iterator 2011-01-20 14:26:57 -05:00
Jonathan Yap 3571e83b64 STORM-869 Minor irregulaties in settings.xml -- remove duplicate entries, formatting cleanup 2011-01-19 06:02:08 -05:00
Boroondas Gupte 8a22154e5d merged VWR-24520: Don't use pkg_check_modules( ... QUIET ) on CMake < 2.8.2 2011-01-18 00:34:09 +01:00
Boroondas Gupte eb9f19dabd VWR-24520: Don't use pkg_check_modules( ... QUIET ) on CMake < 2.8.2
CMake before 2.8.2 doesn't support QUIET for pkg_check_modules(), yet.

Credit goes to Aleric, 'cause he told me what to change.
2011-01-17 18:52:24 +01:00
Oz Linden 74fdba8295 merge changes for vwr-24420 2011-01-17 10:30:36 -05:00
Kitty Barnett 1d7b46e2c3 VWR-24217: allow Contents folder from object to be dragged to inventory 2011-01-17 10:09:52 -05:00
Jonathan Yap 6a3d06deca STORM-844 Better way of doing "More" should be "Less" when Media Control is open
thanks to Twisted Laws
2011-01-16 12:10:44 -05:00
Tofu Buzzard 4f06f3dae6 FIX VWR-24509 Fix SSAO speckling artifacts at distance, re-enable distant SSAO
(transplanted from ef938dea0504b12fcf802f38fcf5457ba566c468)
2011-01-16 13:36:44 +00:00
Loren Shih 584c7ecb4e Automated merge up from viewer-development 2011-01-13 10:28:15 -05:00
Merov Linden c020c5c0f3 STORM-723 : pull in viewer-development 2011-01-12 12:01:44 -08:00
Merov Linden 40cd81f423 STORM-615 : pull in viewer-development 2011-01-12 11:18:19 -08:00
Jonathan Yap e27ae655c6 STORM-844 Minor adjustment to contributions.txt 2011-01-12 10:37:15 -05:00
Jonathan Yap 3703f0bb0d STORM-844 "More" should be "Less" when Media Control is open 2011-01-12 08:24:38 -05:00
Loren Shih fdf19a5268 Automated merge up from viewer-development 2011-01-10 11:20:39 -05:00
Thickbrick Sleaford fe28f89e7e merge VWR-24420 into v-d 2011-01-09 18:29:56 +02:00
Thickbrick Sleaford db1a63e99e FIX VWR-24420 Keep alpha channel in PNG images with background color.
Remove code that composites RGBA PNG images that specify a background
color down to RGB.
2011-01-09 01:13:38 +02:00
Coaldust Numbers 8cfea0bab1 VWR-1095 fix for problems with uploads following bulk upload failure
de minimus contribution accepted without CA - Oz Linden
2011-01-07 15:08:42 -05:00
Jonathan Yap c692b2bdb2 STORM-435 There is no space between name of object and value of object in Chat step while creating new gesture 2011-01-07 13:12:39 -05:00
Loren Shih 61e3c95dbf Automated merge up from viewer-development 2011-01-07 10:14:33 -05:00
Oz Linden 894e98a708 merge changes for storm-812 2011-01-06 14:33:35 -05:00
Loren Shih b30ff3fb9a Automated merge up from viewer-development 2011-01-06 11:06:09 -05:00
Jonathan Yap d0b5e6b0b4 STORM-829 Viewer 2 does not parse /me in object Instant Messages 2011-01-06 06:07:11 -05:00
Oz Linden eb0b8ab3ea merge changes for storm-825 2011-01-05 17:53:37 -05:00
Loren Shih 7c7527b672 Automated merge up from viewer-development 2011-01-05 15:10:39 -05:00
Oz Linden 78895f9e0c merge changes for storm-467 2011-01-04 16:45:08 -05:00
Oz Linden 05810f063d merge changes for storm-737 2011-01-04 16:43:26 -05:00
Oz Linden e4591a8518 merge changes for storm-466 2011-01-04 16:41:05 -05:00
Aleric Inglewood 9531046609 STORM-955: VWR-24312: Massively duplicated objects
Turns out that most of my SNOW-800 patch was included in Viewer 2 (albeit without crediting me).
However, not everything was used and some more cleaning up was possible.

After this patch, and when compiling with optimization, there are no duplicates left
anymore that shouldn't be there in the first place. Apart from the debug stream
iostream guard variable, there are several static variables with the same name (r, r1,
r2, etc) but that indeed actually different symbol objects. Then there are a few
constant POD arrays that are duplicated a hand full of times because they are
accessed with a variable index (so optimizing them away is not possible). I left them
like that (although defining those as extern as well would have been more consistent
and not slower; in fact it would be faster theoretically because those arrays could
share the same cache page then).
2010-12-30 14:53:30 +01:00
Loren Shih 5f99331f4a Automated merge up from viewer-development 2010-12-29 13:23:02 -05:00
Wolfpup Lowenhar 44e6327674 STORM-825 : Reenable the LLMatrix3::orthogonalize test in llmath/tests/m3math_test.cpp
Removed the skipping of a working test as this was causeing a the test to fail
    building and thus not actualy running all the tests.
2010-12-28 19:14:33 -05:00
Jonathan Yap d420ca89b4 STORM-466 Put Twisted Laws name into contributions.txt 2010-12-28 05:32:43 -05:00
Merov Linden 0b74df6774 STORM-523 : pull into viewer-development 2010-12-27 21:21:01 -08:00
Oz Linden 14d830ca43 merge improved fix for STORM_785 2010-12-24 07:41:41 -05:00
Jonathan Yap 1ca028cd7b STORM-812 Make bottom buttons in Object Profile identical for single and multi-prim objects 2010-12-23 17:12:37 -05:00
Loren Shih c87142e5d7 Automated merge up from viewer-development 2010-12-20 12:44:56 -05:00
Jonathan Yap 09c7d38166 STORM-467 Fix for minimap zoom does not persist to the next session 2010-12-18 16:44:51 -05:00
Nyx (Neal Orman) fa17e848a6 Automated merge with https://hg.secondlife.com/mesh-development 2010-12-17 16:19:15 -05:00
Nyx (Neal Orman) 089f9d6d37 merging in fix for CTS-323 / SH-464 2010-12-17 16:06:32 -05:00
Kitty Barnett 452d9d5e3d Updated contributions.txt for STORM-799 and STORM-800 2010-12-17 15:15:10 +01:00
Jonathan Yap 551bfb88fc Adjust parameter in call to setFocusOnAvatar to be more efficient (don't animate) 2010-12-17 07:29:27 -05:00
Loren Shih ee0055f5af Automated merge up from viewer-development 2010-12-16 11:12:15 -05:00
Aleric Inglewood a902160723 VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a non-standard directory.
If tut/tut.hpp isn't installed in a standard include directory all tests
fail because the found include directory for tut isn't passed to the compiler.

This patch fixes this by passing it.
Note that using include_directories() in a Find*.cmake file is bad practise.
The correct way is to set an include dir variable and call
include_directories() once. It certainly doesn't work for the tests anyway
because the tests are all over the place and include_directories is on a
per folder basis.  What is needed is to set it for each (test) target.

However, there is no TARGET_INCLUDE_DIRECTORIES. The closest thing that we
have is to set the COMPILE_FLAGS property for a target.

Fortunately, standalone is only used for linux, so we can just use
-I${TUT_INCLUDE_DIR} to get the effect we want.
2010-12-16 15:43:18 +01:00
Aleric Inglewood 85446c8cf1 VWR-10579: Fix NDOF.cmake to do the right thing on standalone.
The old one just assumed that libndof is installed,
even on standalone.

This patch looks for it on standalone, unless configured
with -DNDOF:BOOL=OFF, and when not found prints an error
message (including telling about -DNDOF:BOOL=OFF).
2010-12-15 22:44:21 +01:00
Aleric Inglewood 5936ced311 SNOW-240: Fix libjson naming madness, again, for standalone.
SNOW-240 was actually about adding the whole search.
While this has been done, there is one issue left:
On linux (and remember, all of this is about standalone)
the libjson packages of distributions don't have this
complex compiler version baked into their name.

See also the last comment on SNOW-240:
https://jira.secondlife.com/browse/SNOW-240?focusedCommentId=205305&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-205305

This patch fixes this issue by first searching for
libjson_linux-gcc-${_gcc_COMPILER_VERSION}_libmt.so
and when that fails search for the system package
library file libjson.so.
2010-12-15 21:23:03 +01:00
Aleric Inglewood 86380bb177 VWR-24254: Add support for using ld.gold on linux.
To use ld.gold configure with:
  -DCMAKE_EXE_LINKER_FLAGS:STRING="-Wl,-use-gold".
ld.gold links the viewer on my machine in 8 seconds, as
opposed to 19 seconds with ld.bfd. Moreover, it uses a
LOT less memory during linking (about 750 MB instead of
2.5 GB!).

VWR-24254: Don't link with fontconfig on non-linux.

While we already added fontconfig in the above patch,
that code turned out to also be used by Windows and
Darwin (contrary to the comments in the code).
After looking at the history of commits and a
discussion on IRC it was decided that the original
coder (Kyle Ambroff <ambroff@lindenlab.com>) really
meant (LINUX AND VIEWER) instead of (NOT LINUX OR VIEWER).
2010-12-15 20:55:10 +01:00
Aleric Inglewood 3f5d67bcb7 VWR-24261: Configuration with cmake 2.8 is extremely slow
Add non-broken FindZLIB.cmake.
2010-12-20 16:10:07 +01:00
Aleric Inglewood d0a25a4184 VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.
If Qt and/or llqtwebkit is found in a non-standard place, you still
have to set LD_LIBRARY_PATH yourself (to $QTDIR/lib) before running
the viewer of course (or the webkit plugin will silently fail).
2010-12-15 20:12:17 +01:00
Aleric Inglewood 0de05499ed VWR-24247: develop.py configure still searches for the wrong header file when checking for Tut
The viewer code includes "tut/tut.hpp" everywhere, so that is what we
should search for when determining an include path for this header.
This just searches in the usual places, including the paths provided
through CMAKE_INCLUDE_PATH, and will find tut/tut.hpp: exactly what
we need.
2010-12-15 17:40:22 +01:00
Aleric Inglewood 429e0caf17 SNOW-744: scripts/install.py --uninstall does not remove symbolic links.
This fixes the problem that when some package contains symbolic
links, they were never removed anymore (after an uninstall of
that package).
2010-12-15 17:31:18 +01:00
Wolfpup Lowenhar bd53ba004a STORM-776 : unable to change permissions to "no trans" on item in avatar inventory
applied Kitty's code changes listed in STROM-288 as it is a related issue and this
   actualy fixed both issues!
2010-12-15 09:53:24 -05:00
Tofu Buzzard a6e8026de0 CTS-411 edge ghosting in deferred rendering (w/shadows and shadow smoothing enabled)
(transplanted from c698ce37c0502597aafc75fcf9c37ff2970b7faf)
(transplanted from ae92e806703a0c03ec2ab76d74906c7465285aaf)
2010-12-15 13:40:28 +00:00
Andrew Productengine d3eccbcd8b STORM-229 FIXED Fixed long loading times and stalling of Viewer while loading big scripts or pasting a lot of text into script.
The bug was fixed by Satomi Ahn. Here is the description of what causes the problem from her comment in ticket:
"Disabling the loading of syntax keywords in LLScriptEdCore::postBuild() removes the freeze (and with it: syntax highlighting).
So it obviously comes from the parsing of the text.

I also noticed something else: by adding a llwarn in LLTextEditor::updateSegments(), I saw that this function was called a lot of times when loading a script, roughly once for each line in the script (naively I would have thought only necessary to update when finished... or to only update the new line).
My llwarn was in the "if (mReflowIndex < S32_MAX && mKeywords.isLoaded())", which means that, at each call, the text is actually parsed for all keywords... so the parsing of the script becomes quadratic instead of linear!!!"

- To fix this, Satomi added a flag depending on which parsing is disabled when it is not necessary.
2010-12-13 13:17:48 +02:00
Loren Shih 6a59861bde Automated merge up from viewer-development 2010-12-07 14:56:36 -05:00
Jonathan Yap 066dfaee28 Add + control to Inventory/Recent tab 2010-12-07 10:14:07 -05:00
Merov Linden 8afbb58d4c Pull viewer-beta in 2010-12-06 16:56:25 -08:00
Loren Shih 963e3346b1 Automated merge up from viewer-development 2010-12-03 10:41:46 -05:00
Jonathan Yap 71a1fd09e3 Add ability to see Details button in Object Profile for 1-prim objects 2010-12-03 10:15:33 -05:00
Jonathan Yap 50b6114862 Tiny change to panel_login.xml so Start Location preferences work under all circumstances 2010-12-03 07:30:19 -05:00
Jonathan Yap 106134b695 Fix for OK notification being overlaid by Keep/Discard/Block notification 2010-12-03 03:37:37 -05:00
Oz Linden 375d91019e merge fix for STORM-679 2010-12-02 14:08:23 -05:00
Oz Linden 20e192029c merge fix for STORM-596 2010-12-02 14:02:46 -05:00
Jonathan Yap 31f738583e Forgot to give myself credit 2010-12-01 13:35:30 -05:00
Loren Shih bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05:00
Jonathan Yap 732b1f748e Forgot to give myself credit. 2010-11-25 13:45:05 -05:00
Boroondas Gupte 8edd7e94b1 merged CTS-323: Don't cast pointers to U32 2010-11-23 01:52:11 +01:00
Nyx (Neal Orman) be1fd73390 CTS-320 SH-465 FIX use system zlib for standalone builds
pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx
2010-11-22 18:42:34 -05:00
Wolfpup Lowenhar abf406e3d5 STORM-674: corrected duplicate name tags in pannel_preferences_color.xml 2010-11-23 20:55:18 -05:00
Jonathan Yap fbfe7418e5 Moved Enable Hints to 2nd line of Help menu 2010-11-20 07:25:09 -05:00
Oz Linden 0f72f152e8 merge fix for STORM-616 2010-11-19 15:52:52 -05: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
Jonathan Yap 7e5e9b26d5 Forgot to give myself credit. 2010-11-18 14:09:00 -05:00
Wolfpup Lowenhar 10998b137e STORM-535 : STORM-544 : Addition of Floater Opacity controls to pannel_prefferences_color.xml
after loss during cleanup of preferences.
2010-11-16 13:33:56 -05:00
Vadim ProductEngine e8e1d7e629 STORM-318 FIXED The Advanced menu shortcut was broken under Linux.
Reason: The old shortcut (Ctrl+Alt+D) was eaten by some window managers.

Changes:
- Changed the shortcut to Ctrl+Alt+Shift+D.
- Moved the appropriate menu item from "Advanced > Shortcuts" to "World > Show"
  (so that it's not in the menu it triggers) and made it visible.
  The old shortcut is still available but marked as legacy.

Submitting on behalf of Boroondas Gupte.
2010-11-15 21:38:12 +02:00
Wolfpup Lowenhar 899f470dec STORM-102: Merge from viewer-development 2010-11-11 22:37:51 -05:00
Seth ProductEngine 54bf5d9de7 Added Tofu Buzzard to the contributors list. 2010-11-09 23:01:49 +02:00
Oz Linden eea9460ba5 merge storm-102 branch back to default 2010-11-09 15:18:51 -05:00
Wolfpup Lowenhar 669cf170ce STORM-102: STORM-143: Refactored the STORM-103 code to pull the proper plain test log no
matter when it was generated or if it has the date stamp in the name of the log or not.

--HG--
branch : storm-102
2010-11-08 09:31:35 -05:00
Oz Linden e2714252f3 pull fix for STORM-422 2010-11-03 14:53:29 -04:00
Oz Linden 96112dfa26 STORM-477: fixed getNextFileInDir on Windows7, improved test cases and documentation
--HG--
branch : storm-102
2010-11-03 13:33:29 -04:00
Merov Linden e9640296d3 STORM-420 : merge to viewer-development 2010-11-02 17:27:39 -07:00
Vadim ProductEngine 5d7417b40e STORM-422 FIXED Added command line option "-disablecrashlogger" to disable crash logger.
This is a patch originally written by Robin Cornelius.
I made it work with Google Breakpad.
2010-11-02 20:26:38 +02:00
Wolfpup Lowenhar a4bb2b8bdd STORM-255 : Merge from viewer-development 2010-10-31 08:08:41 -04:00
Merov Linden 398b8564e1 STORM-420 : allow teleport when double clicking the minimap if doubleclick teleport is on, allow beacon setting if not 2010-10-29 15:42:29 -07:00
Vadim ProductEngine 463969116f STORM-501 FIXED Script-editor shows ERRORS in the wrong line.
LLTextBase::setCursor() sometimes failed to work properly if line wrapping was enabled.
This is a slightly optimized version of the patch made by Satomi Ahn.
2010-10-29 23:48:46 +03:00
Wolfpup Lowenhar dafece369a STORM-255 : Added missing JIRA issue to contributions.txt 2010-10-29 09:16:51 -04:00
Wolfpup Lowenhar 46940d4a5f STORM-255: removal if extra jira numbers in contributions.txt 2010-10-27 22:27:59 -04:00
Wolfpup Lowenhar ce34ba1b89 Merge from viewer-development 2010-10-27 09:04:27 -04:00
Wolfpup Lowenhar 7c89e565b3 This is the setting of the core file name date stamp code and settings files for
Chat, Group and IM Logs.

--HG--
branch : storm-102
2010-10-26 20:02:07 -04:00
Merov Linden ebce1a4ea8 STORM-416 : merge with viewer-development 2010-10-26 10:59:37 -07:00
Wolfpup Lowenhar b011305d3f Addtition of Alexandrea Fride to contributions.text 2010-10-26 08:41:30 -04:00
Boroondas Gupte 0aba56e2db CTS-320 (part 3 of 3) use system zlib for standalone 2010-10-25 11:39:56 +02:00
Boroondas Gupte 03acf85c36 CTS-320 (part 2 of 3) use system zlib for standalone 2010-10-25 11:38:33 +02:00
Boroondas Gupte e3d61c9236 CTS-320 (part 1 of 3) use system zlib for standalone 2010-10-25 11:36:07 +02:00
Boroondas Gupte 4f388eacf6 merged CTS-323: Don't cast pointers to U32 2010-10-24 16:13:31 +02:00
Boroondas Gupte 32b0747e33 CTS-323: (part 2 of 2) Don't cast pointers to U32 2010-10-24 16:07:43 +02:00
Boroondas Gupte e2049c332b CTS-323: (part 1 of 2) Don't cast pointers to U32 2010-10-24 16:01:57 +02:00
Wolfpup Lowenhar b82220aefc Merge from Viewer-development 2010-10-22 22:22:54 -04:00
Merov Linden de6f7e19c4 STORM-423 : merge with viewer-development 2010-10-22 16:18:36 -07:00
Merov Linden 01b01d94f4 STORM-406 : merge with viewer-development 2010-10-22 15:17:49 -07:00
Wolfpup Lowenhar 19836c86e9 Merge from Viewer-development 2010-10-21 10:59:11 -04:00
Merov Linden 9652de51ce STORM-281 : merge to viewer-development + fix indentation 2010-10-20 20:13:47 -07:00
Merov Linden a0417239ab STORM-417 : merge with viewer-development 2010-10-20 19:51:31 -07:00
Merov Linden 44b428f4c3 STORM-419 : merge with viewer-development 2010-10-20 19:46:38 -07:00
Merov Linden 755fdfb25f STORM-423: fix raw file association in strings.xml 2010-10-20 14:59:39 -07:00
Vadim ProductEngine b3f3fb6099 STORM-417 FIXED Port of SNOW-140 to SG 2.0 : Forced updates not working on Mac
The point of this patch is to make the Mac updater code a bit more flexible
and reliable than it is right now. The issue is double:
 * reliability: the string comparison code on the bundle identifier is not UTF8 compliant
 * flexibility: the bundle identifier is hard coded to match the bundle identifier of LL viewer
   (i.e. com.secondlife.indra.viewer) so it can't work for another viewer
   (in particular, it didn't work for Snowglobe).
   The "bundle identifier" is one of those Mac only thing stored in the Info.plist of a "bundle"
   (the ".app" folder that's bundling an executable and all its resources and is seen
   as an application when browsing with the Mac OS X Finder).

The patch fixes both issues:
 * compare correctly UTF8 encoded strings
 * allow the bundle ID to be passed as a parameter to the updater

The patch has really no consequence on LL viewer. It's more a matter of having cleaner, better code.

Author: Cypren Christenson
Ported and reviewed by: Merov Linden
2010-10-20 21:23:27 +03:00
Vadim ProductEngine 243210e0ab STORM-419 FIXED <anonymous>' is used uninitialized in this function in lldarray.h
Author: Robin Cornelius
Ported by: Techwolf Lupindo
Reviewed by: Merov Linden
2010-10-20 20:26:47 +03:00
Merov Linden e44b548704 STORM-281 : Fix Map FOV frustum when UI size not equal to 1 2010-10-19 17:48:35 -07:00
Boroondas Gupte 2c2cada190 merged VWR-23459 (fixed crash for certain command line options when compiled against Boost-1.42) 2010-10-16 21:15:06 +02:00
Boroondas Gupte (original fix by Aleric Inglewood) 0f1d345e18 VWR-23459 FIXED Viewer compiled against Boost-1.42 crashes when certain command line options are given
used Aleric's SG2 changeset from http://svn.secondlife.com/trac/linden/changeset/3600
	patching file doc/contributions.txt
	Hunk #1 succeeded at 73 with fuzz 2.
	patching file indra/newview/llcommandlineparser.cpp
	Hunk #1 succeeded at 268 with fuzz 1 (offset -8 lines).

Edited doc/contributions.txt to create an entry for Aleric and moved the
issue ID there (patch wasn't able to place it at the right position,
lacking any context).
2010-10-16 18:24:52 +02:00
Boroondas Gupte 6caf8a4575 merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUE 2010-10-16 17:19:08 +02:00
Boroondas Gupte eeefd84950 merged VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUE 2010-10-16 17:18:38 +02:00
Boroondas Gupte d53613b5ae VWR-23455: Don't download FMOD unless INSTALL_PROPRIETARY is TRUE 2010-10-16 17:11:47 +02:00
Oz Linden 93d31d9bfe merge fixes for STORM-374 2010-10-12 17:32:56 -04:00
Boroondas Gupte f36085b0de merged SNOW-756 / VWR-23385 / STORM-374 (fixed standalone LD_LIBRARY_PATH for unit tests) 2010-10-12 17:26:50 +02:00
Oz Linden 3f43a36d34 merge fixes for VWR-23296 2010-10-12 08:47:26 -04:00
Boroondas Gupte (patch by Aleric Inglewood) 8f77ebbcd9 SNOW-756 / VWR-23385 FIXED standalone LD_LIBRARY_PATH for unit tests
Used patch from https://jira.secondlife.com/secure/attachment/41586/SNOW-756-standalone_tests.diff

patching file indra/cmake/LLAddBuildTest.cmake
Hunk #1 succeeded at 259 with fuzz 2 (offset 1 line).

Added entry in doc/contributions.txt. No further changes.

originally commited to Snowglobe 2.1 at http://svn.secondlife.com/trac/linden/changeset/3515
2010-10-12 00:39:23 +02:00
Oz Linden 011f6f9ad0 merge fix for STORM-275 (class Linux_x86_64Manifest missing from viewer_manifest.py) 2010-10-11 09:10:56 -04:00
Oz Linden bb74487c85 Merge fixes for VWR-23047, VWR-20911, and SNOW-748 2010-10-08 10:47:25 -04:00
Boroondas Gupte d18b636fb8 merged VWR-20893: "class Linux_x86_64Manifest" missing from viewer_manifest.py Breaking linux 64-bit build.
(transplanted https://bitbucket.org/Techwolf/viewer-development/changeset/111a293c0e1c to create an isolated daggy fix)
2010-10-06 17:09:38 +02:00
Boroondas Gupte 422780c88a merged SNOW-654: Added missing "if (LL_TESTS)" in indra/CMakeLists.txt 2010-10-05 00:02:30 +02:00
Boroondas Gupte (original fix by Techwolf Lupindo) d918701d58 SNOW-654: Added missing "if (LL_TESTS)" in indra/CMakeLists.txt
Daggified version of http://svn.secondlife.com/trac/linden/changeset/3431
(or of the SNOW-654 part of https://bitbucket.org/Techwolf/viewer-development/changeset/5697874b390b )
2010-10-04 23:54:31 +02:00
Boroondas Gupte ccb734e26c merged SNOW-651: Added missing "if (LL_TESTS)" in indra/llplugin/slplugin/CMakeLists.txt 2010-10-04 23:46:27 +02:00
Boroondas Gupte (original fix by Techwolf Lupindo) 5bcfa063b4 SNOW-651: Added missing "if (LL_TESTS)"
Daggified version of http://svn.secondlife.com/trac/linden/changeset/3523
(or of the SNOW-651 part of https://bitbucket.org/Techwolf/viewer-development/changeset/5697874b390b )
2010-10-04 23:01:43 +02:00
Wolfpup Lowenhar 5db02993ef [STORM-255] As a user I would like to disable incoming Group/IM toasts from showing up.
This will also take care of STORM-221 since the person that would be affected by
	the toast cha now disable them.
2010-09-27 20:20:09 -04:00
Boroondas Gupte c438e8a183 merged SNOW-599/SNOW-747: Pulseaudio should be optional on Linux. 2010-09-28 00:06:12 +02:00
Tofu Linden 014eb72f1f merge storm-173 2010-09-27 16:54:14 +01:00
Merov Linden 214cdc4177 STORM-173 : Add Build > Object > Return Object 2010-09-24 15:38:21 -07:00
Boroondas Gupte 704cdf2bc3 merged SNOW-746: Finished Google BreakPad cmake for standalone 2010-09-29 12:57:32 +02:00
Tofu Linden 264b549bcb merge storm-163 / Port of VWR-14914 to SG 2.0 : Intermittent FPS drop related to "audio" (main thread hangs often on openal lock) 2010-09-22 19:53:16 +01:00
Tofu Linden f007369357 merge storm-162 2010-09-22 10:03:30 +01:00
Vadim Savchuk 5b2d4a1698 STORM-163 FIXED Intermittent FPS drop related to "audio" (main thread hangs often on openal lock)
Submitting a patch made by Aleric Inglewood (See VWR-14914).

This bug happens for a lot of people, although it might be needed to have a fast multi core machine.
I have seen it on 1.22.10 once, never used 1.23 sorry, and saw it often on snowglobe. I am sure
it also affects 1.23 but I'd have to test that.

The symptons are that on a viewer with normally a good, high FPS, sometimes it happens
that the FPS dramatically drops (as low as 0.3, but it can also be anything higher, as high
as 10, say).

This particular jira is about a problem where the main thread is slowed down by a mutex lock
in libopenal (most calls starting with 'al' in indra/llaudio/audioengine_openal.cpp and
one in indra/llaudio/listener_openal.cpp). You can see that this is the case by opening the
Frame Console (control-shift-2) and checking that the "audio" (and possibly misc) timings
are very large compared to the Render time.
2010-09-21 19:11:40 +03:00
Vadim Savchuk 483e22a64d STORM-166 FIXED Memory leak in LLSelectNode constructor.
Submitting on behalf of Thickbrick Sleaford.

One of the LLSelectNode constructors has a leak where it does "new LLPermisions()" twice, thus leaking the address of the first object created.

This constructor is called every time you interact (click, hover, select, possibly other) with an object, once for each prim in the object. Since sizeof(LLPermissions) is 92 bytes, this can be a significant amount after a while.

I think this might explain VWR-18528 (leaking LLpemissions instances), at least partially.

This was fixed in snowglobe 1.x as part of SNOW-267.
2010-09-21 17:41:53 +03:00
Merov Linden 136029821c STORM-162 : Makes the folder code more resilient 2010-09-20 17:24:33 -07:00
Tofu Linden 14cf6fd5a2 merge from http://bitbucket.org/boroondas/viewer-development-vwr-20583 2010-09-20 18:15:20 +01:00
Tofu Linden 27bbf79c89 merge. 2010-09-17 17:40:34 +01:00
Oz Linden 5215bf9925 [STORM-175] Fix Ping Interpolate Object Position 2010-09-16 20:01:35 -04:00
Boroondas Gupte 970ce1e162 Merged VWR-23047 (SNOW-512, -fPIC for 64bit) and follow-ups (VWR-20911 & SNOW-748) 2010-09-16 13:51:15 +02:00
Boroondas Gupte 58c08f7c2c SNOW-512 FOLLOWUP merged VWR-20911 with SNOW-748
VWR-20911 fixes the arch detection that the SNOW-512 fix relies on.
SNOW-748 fixes a Mac build failure introduced by SNOW-512.
2010-09-16 13:35:07 +02:00
Merov Linden 1fb2f1b37a STORM-130 : version agnostic libPNG : pulling Boroondas change 2010-09-15 12:59:08 -07:00
Oz Linden bf2849ef23 [STORM-176] Clean up handling of the maximum length of chat messages 2010-09-15 11:33:59 -04:00
Boroondas Gupte 6e1ba9c960 merged STORM-130 (a.k.a. VWR-22769, SNOW-737 Version agnostic libPNG linking) 2010-09-15 16:07:13 +02:00
Aimee Linden 2399b8673b STORM-86 MERGE Double-click Teleport 2010-09-15 11:49:17 +01:00
Merov Linden 81ea8d1751 Pull from lindenlab/viewer-development 2010-09-09 10:40:25 -07:00
Aimee Linden 4991d7903d Merge 2010-09-07 21:10:41 +01:00
Boroondas Gupte a18e83e060 re-merged VWR-20583 2010-09-05 23:07:02 +02:00
Tofu Linden 1d158a312e contrib file update for vwr-19505 2010-09-03 18:39:57 +01:00
Boroondas Gupte 1b4ae0e053 merged VWR-20583 2010-09-02 19:34:26 +02:00
Boroondas Gupte 3e299ab764 VWR-20583 FIXED submenu indicators (▶ a.k.a. U+25B6) shouldn't be hard-coded
in context menu sub menu names

Use the same mechanism for adding the triangle in LLContextMenuBranch as
is already used in LLMenuItemBranchGL. As a bonus, the triangles will be
nicely right-aligned, just as in the main menu.

Remaining hard-coded triangles all are in indra/newview/skins/default/xui/*/panel_voice_effect.xml.
2010-09-02 18:29:42 +02:00
Tofu Linden 63f2ddf377 merge for VWR-1852 VWR-8726 VWR-4232 VWR-22752 2010-09-02 11:27:52 +01:00
Merov Linden f2d61c7371 VWR-22759 : port of SNOW-667, Automatic language translation of chat messages 2010-09-01 14:41:51 -07:00
Aimee Linden ae115d1a89 Merge 2010-09-01 17:46:48 +01:00
Tofu Linden f7f8c18600 VWR-17801 Wrong submenu character when you right click on yourself
Patch by jonathan yap.
2010-09-01 16:16:52 +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
Merov Linden 786df38c2a SNOW-681 VWR-1852 : Local ruler mode aligned incorrectly for linked objects 2010-08-31 21:36:45 -07:00
Merov Linden 6d8208bac9 SNOW-684 VWR-4232 : Some particles don't disappear when UI is hidden 2010-08-31 21:34:02 -07:00
Merov Linden be07498847 SNOW-683 VWR-8726 : Turn off swirling lights for scripted objects 2010-08-31 21:11:28 -07:00
Merov Linden 97d52e2a3e SNOW-680 VWR-10854 : Honour share with group and allow anyone to copy for snapshots 2010-08-31 21:07:23 -07:00
Dave Parks e68f9e566b merge 2010-08-31 16:37:40 -05:00
Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius) 88e7a631b3 SNOW-512/SNOW-287: Build of LLPlugin fails on 64bit linux due to non PIC code linking into the DSO
Formatting, cleanup, and one minor change by Techwolf Lupindo.
Minor change was a move of the hunk in
indra/media_plugins/webkit/CmakeLists.txt to same area as the other plugins CmakeLists.txt files.

daggyfied version of https://bitbucket.org/Techwolf/viewer-development/changeset/00bd21962052
2010-09-16 13:26:45 +02:00
Boroondas Gupte (patch by Robin Cornelius) 570b91f472 VWR-20911 FIXED CMake build arch detection is inaccurate and incomplete
Robin Cornelius' patch from
http://jira.secondlife.com/secure/attachment/42801/SNOW-776+Don%27t+use+uname+for+build+arch+detection%2C+use+compiler.patch
applied without fuzz:

	patching file indra/cmake/Variables.cmake
	Hunk #1 succeeded at 52 (offset -2 lines).

Added entry in doc/contributions.txt.
No further changes other than that.
2010-08-31 12:16:03 +02:00
Ardy Lay bdd1017d0d [mq]: VWR-19499-AppUriChatLimit 2010-08-30 14:18:48 -05:00
Oz Linden d84c6625c7 Automated merge with http://bitbucket.org/aleric/viewer-development-aleric-export 2010-08-30 06:38:44 -04:00
Boroondas Gupte 9c4a2547b9 SNOW-737 FIXED Version agnostic libPNG linking
Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff
applied with fuzz 3:

	patching file indra/cmake/PNG.cmake
	Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines).
	patching file indra/llimage/llpngwrapper.cpp
	Hunk #1 succeeded at 215 (offset -2 lines).
	Hunk #2 succeeded at 363 (offset -2 lines).
	patching file indra/llimage/llpngwrapper.h
	Hunk #1 succeeded at 31 (offset -2 lines).

Added entry in doc/contributions.txt.
No further changes other than that.
2010-08-29 18:32:20 +02:00
Boroondas Gupte 27ec784127 VWR-20891 FIXED missing LL_TEST conditions in indra/viewer_components/login/CMakeLists.txt
(transplanted from 6ea6df364e22ba6f99b18a0e684ba4912f4f7223)
2010-08-29 16:43:08 +02:00
Boroondas Gupte (patch by Robin Cornelius) 136858bd20 VWR-20911 FIXED CMake build arch detection is inaccurate and incomplete
Robin Cornelius' patch from
http://jira.secondlife.com/secure/attachment/42801/SNOW-776+Don%27t+use+uname+for+build+arch+detection%2C+use+compiler.patch
applied without fuzz:

	patching file indra/cmake/Variables.cmake
	Hunk #1 succeeded at 52 (offset -2 lines).

Added entry in doc/contributions.txt.
No further changes other than that.
(transplanted from a9132a63e4739965d65ddd58a7be9eabe4321c2a)
2010-08-31 12:16:03 +02:00
Boroondas Gupte (patch by Aleric Inglewood) 9ff0490998 SNOW-764 (problem 1) FIXED Bugs showing when compiling with optimization
also fixes:
SNOW-522 FIXED crash due to looking for skins/paths.xml at the wrong path

originally commited at http://svn.secondlife.com/trac/linden/changeset/3550

SVN changeset did not apply automatically due to changed context.
Manually applied changes, which was straight forward.

Added SNOW-522 in doc/contributions.txt, because that's fixed by this, too.
(transplanted from 8afc8382dd9bddd4968060d306d96218d571a171)
2010-08-31 17:07:26 +02:00
Tofu Linden 5e0d27b1c3 port of 'SNOW-592 FIXED gstreamer 0.10.28 standalone build failure' 2010-09-25 11:02:02 +01:00
Tofu Linden b9f5ced5bb VWR-23181 (port of SNOW-650) 'Tries to build pulseaudio when pulseaudio not found.' 2010-09-25 10:37:59 +01:00
Merov Linden b85cf7b125 Pull update from viewer-development 2010-09-24 11:23:07 -07:00
Merov Linden 24473fc0d6 STORM-161 : Reimplement hide object selection 2010-09-16 15:31:07 -07:00
Aimee Linden b1c677a6e7 Merge 2010-08-28 16:03:53 +01:00
Aleric Inglewood c4acbaf7c4 SNOW-766: Add a 'printbuilddirs' command to develop.py 2010-08-27 17:32:41 +02:00
Merov Linden dbe965eaa1 Sync with viewer-development 2010-08-26 21:45:20 -07:00
Aimee Linden 34a063ae5a VWR-20715 Double-click teleport
SNOW-352/SNOW-421/SNOW-462 Imported from Snowglobe 2
By Twisted Laws and Thickbrick Sleaford
2010-08-26 16:49:41 +01:00
Merov Linden 5361e6826f VWR-20710 : Sit anywhere, port of SG2.x SNOW-610 patch 2010-08-25 10:58:49 -07:00
Techwolf Lupindo 1b27c4f9c7 SNOW-599/SNOW-747: Pulseaudio should be optional on Linux. 2010-08-22 19:20:29 -04:00
Techwolf Lupindo e089937a0d VWR-20893: "class Linux_x86_64Manifest" missing from viewer_manifest.py Breaking linux 64-bit build.
(transplanted from 111a293c0e1c9062b1aa83dda7cf28aa22754930)
2010-08-22 16:05:41 -04:00
Thickbrick Sleaford b2b670d787 VWR-20752 (SNOW-586) Align planar-mapped textures across different faces.
Port of svn changset 3458 from Snowglobe, with minor tweaks.
2010-08-21 01:41:27 +03:00
Aimee Linden 89cb5aa99e VWR-20855 (SNOW-510) FIXED Cannot find tut/tut.hpp in Standalone builds 2010-08-20 18:16:23 +01:00
Aimee Linden aabf1b4fa2 VWR-20847 (SNOW-543/SNOW-517) FIXED Linux packaging fixes. 2010-08-20 14:06:32 +01:00
Aimee Linden 29512788ad VWR-20815 (SNOW-511) Allow standalone builds to correctly find a system version of llqtwebkit 2010-08-19 18:36:14 +01:00
Aimee Linden 6f1d8b1d05 VWR-20810 (SNOW-503) Oops ... forgot the doc/contributions.txt entry (No functional change) 2010-08-19 16:03:08 +01:00
Aimee Linden b9853f8e09 VWR-20809 (SNOW-504) Do not depend on stage_thirds_party_libs for a standalone build. 2010-08-19 13:31:45 +01:00
Aimee Linden 2977cbb741 VWR-20770 (SNOW-649) FIXED Missing LL_TESTS condition around llplugin unit test 2010-08-18 17:56:58 +01:00
Aimee Linden 855192a83b VWR-20768 (SNOW-507) FIXED Missing LL_TEST conditions in cmake files 2010-08-18 17:41:36 +01:00
Aimee Linden 5bb7cbc663 VWR-20749 (SNOW-624) FIXED Fix compiling the viewer with Boost 1.42 2010-08-18 13:01:56 +01:00
Aimee Linden 6baedc1370 VWR-20748 (SNOW-520) FIXED Make develop.py play nicely with express editions of Visual Studio 2010-08-18 12:30:26 +01:00
Aimee Linden fcb240792f VWR-20747 (SNOW-527) FIXED Don't import deprecated python module sets 2010-08-18 11:58:24 +01:00
Aimee Linden b53ac25d5c SNOW-585 (VWR-20679) FIXED Build failure when the FMOD lib is not present.
Also added Mac version of the same fix, and corrected the warning message in the Linux version that was already there.
2010-08-17 03:38:45 +01:00
Techwolf Lupindo c2d844c972 SNOW-746: Finished Google BreakPad cmake for standalone
(transplanted from 5a7ee78d029e973084e28d0d23a7233e0d976dca)
2010-08-16 22:10:18 -04:00
Aimee Linden 3b59f688c1 VWR-20673 (SNOW-743) FIXED Compiler warning: 'region_access' may be used uninitialized in this function 2010-08-16 17:03:23 +01:00
Aimee Linden 6981353b1a VWR-20671 (SNOW-514) FIXED Protection on LLInstanceTracker base in LLNameListCtrl needs to be public for gcc >4.1 2010-08-16 16:40:13 +01:00
Aimee Linden e9f14e3001 VWR-20670 (SNOW-506) FIXED Protection on LLInstanceTracker base in LLEventTimer needs to be public for gcc >4.1 2010-08-16 16:39:12 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Linden 15247f0869 Backed out changeset: 58571b4e704b 2010-07-27 14:22:14 -07:00
Dessie Linden 5d85dad85f Reverted changeset 2bb10eae42bf 2010-07-15 12:31:08 -07:00
Aimee Linden efb72e66d0 SNOW-484/DEV-51808 FIXED Recursive animations can crash viewer 2010-07-12 17:54:02 +01:00
Tofu Linden 2fc77b8ee8 VWR-19683 llmediaimplgstreamervidplug gcc 4.4 build errors 2010-06-15 13:13:24 +01:00
Tofu Linden f5ae54f8c3 DEV-11516 FIXED VWR-5308: Current wind noise generation is CPU intensive.
Minor optimizations to wind generation.  Patch by gigs and aimee, reviewed by merov.
2010-06-08 20:48:57 +01:00
Nyx (Neal Orman) 2caa710a46 VWR-19699 WIP Correct operations for wear and replace on wearables
Resident-submitted patch, cleaned up so it matches style and compiles/builds
well. Appears to work for stated goals but will need some more UI work to
ensure consistency.

WIP checkin, will be code reviewed before pushing.
2010-06-03 20:06:25 -04:00
Tofu Linden 13d2501c84 SNOW-207/DEV-42245 : FIXED : Texture loading on sculpty plants is failing making content appear to be of poor quality.
Patch by Thickbrick, reviewed by me.
2010-05-20 11:38:57 +01:00
Aimee Linden 6a6af64e07 DEV-39789 (SNOW-627/SNOW-227/VWR-15454): Remove obsolete Apple FSCopyObject code from mac-updater 2010-04-26 02:19:57 +01:00
Aimee Linden f758852266 DEV-42251 (SNOW-570 / SNOW-220 / VWR-14711): WaitNextEvent() is deprecated in the OS X 10.6 SDK
Imported from Snowglobe.
Use RunApplicationEventLoop() instead of WaitNextEvent() while the viewer is waiting for the crash logger to exit.
2010-04-25 00:41:41 +01:00
Aimee Linden 5fa00a67af DEV-39786 (SNOW-572 / SNOW-220 / VWR-14712): GL_COLOR_INDEX8_EXT not defined as GL_EXT_paletted_texture is deprecated.
Imported from Snowglobe.
2010-04-24 20:36:42 +01:00
Aimee Linden 234cd6e7c0 Fix-up of doc/contributions.txt (missed another one!), no functional changes 2010-03-13 20:04:54 +00:00
Aimee Linden d44485b106 Fix-up of doc/contributions.txt, no functional changes 2010-03-13 19:48:22 +00:00
Tofu Linden 563daa96a8 pull in the linux+solaris fast-timers impl from snowglobe, fit it into viewer2, start moving headers around. 2010-01-25 12:07:25 -08:00
Tofu Linden 6fde9c8fdb DEV-39784 SNOW-218: KDE 4 applications don't recognize secondlife:// urls
patch by thickbrick sleaford, reviewed by me (tofu linden)
2009-12-23 16:40:24 -08:00
Nyx (Neal Orman) 8066f48685 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-04 09:54:07 -05:00
Soft Linden 4e52e09fea DEV-37978 VWR-8617: Missing / incorrect keywords TEXTURE_MEDIA and TEXTURE_DEFAULT 2009-11-03 15:49:33 -06:00
Soft Linden 2a0697711a DEV-41348 SNOW-278 Clean up mime_types.xml - missed credit 2009-11-03 15:45:30 -06:00
Nyx (Neal Orman) 9d8bd3625a DEV-1186 possibly typo in avatar_lad.xml
bumped wearable definition number and fixed minor typo in avatar_lad.xml - fix submitted by external contributor.
Verified the change is correct and gave credit - change is de minimis, but we haven't caught this/noticed on our
own for a while.

Code reviewed by Bigpapi
2009-11-03 14:41:53 -05:00
Martin Reddy f0193202c5 DEV-41410 SNOW-204: merging this snowglobe fix into viewer-2.0.0-3.
Provides more robust gcc version checking for suppressing warnings.
2009-10-16 14:35:24 +00:00
Adam Moss 406927f629 Merge a big bunch of fixes from maint-viewer. Hooray.
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9

DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +00:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
2009-09-22 11:11:45 +00:00
Neal Orman 4447005b72 DEV-34299 - VWR-13996: Avatars are invisible, except for attachments
One-line fix for a very old bug. Bug was hunted and fixed by resident Aleric Inglewood. Code reviewed by Nyx. Patch is a one-off, de minimis change. Contact Nyx if any problems with this code.

 -Nyx
2009-07-14 15:24:37 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Adam Moss 9dfe0ca9a0 svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-22 09:58:47 +00:00
Adam Moss cc92525b0d QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Brian McGroarty 518afb3ac5 This is causing open source build problems - cherrypicked DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining 2009-04-09 21:36:21 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
Adam Moss 7573288ab3 svn merge -r113780:113785
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732

QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST
improvements - combo merge
2009-03-09 23:42:07 +00:00
Eric Tulla 6db6d81b0a Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).
No conflicts in the merge.

Result of:
svn merge -r113372:113479 $branches/avatar-pipeline/avatar-pipeline-merge-r113370 .
2009-03-05 00:29:27 +00:00
Brad Kittenbrink abdc99f21b Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
Adam Moss 6861459c48 QAR-1202 Mergeme for Viewer font in Russian, Ukrainian (for business
reasons):

svn merge -r109512:109516
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-l10n/maint-l10n-3


DEV-22792 Russian and Ukrainian Viewer strings submission

DEV-24945 Chat console with scaled UI shows vertically misaligned
characters

DEV-25459 Viewer text-snapping is broken in a few ways

DEV-23475 Change the win32 viewer's font prioritization order to be more
Cyrillic-friendly

QAR-1042 Viewer in Russian, Ukrainian: need to verify that
French/German/Japanese/Korean were not effected by import of Russ and
Ukr.
2009-02-06 17:16:06 +00:00
Mark Palange 46f8fb8781 svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22
Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227
2009-02-03 21:15:57 +00:00
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
2009-02-03 17:56:26 +00:00
Mark Palange 446c55538e svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-13 03:46:56 +00:00
Bradley Payne 95f365789f Missed contributor for VWR-8430, DEV-18635. Putting directly in trunk as this has already been merged from featurettes.
Change OKed with Q (the current lockholder) prospero, and robla.
2008-12-31 17:38:28 +00:00
Mark Palange fb793870fe QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
Brian McGroarty 1e4c7907b5 clean up contributions.txt - seriously 2008-12-16 16:23:53 +00:00
Brian McGroarty 0d43d46544 VWR-1813 was credited to the wrong contributor 2008-12-16 16:18:28 +00:00
Melinda Green e1d8dac25a svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
2008-12-15 21:21:19 +00:00
Brian McGroarty 114497a7b6 Missing contributions.txt credits 2008-12-09 19:54:55 +00:00
Adam Moss fd46865a50 QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
Adam Moss a879e13055 svn merge -c102054
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015

QAR-1016 joystick+spacenav improvements MERGE
2008-11-12 20:28:24 +00:00
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
Kartic Krishnamurthy b2bfb128e7 Merged into release with command:
=================================
svn merge -r100865:101402 svn+ssh://svn/svn/linden/branches/purge-dpo-code-for-merge .

QAR-951 : Sandbox QA for DEV 20842 - Ensure DPO is not enabled accidentally
QAR-967 : Merge Build for DEV 20842 - Ensure DPOis not enabled accidentally
QA tested: Beast, Oskar

DEV's fulfilled as part of this branch:
======================================

DEV-20842 Prevent accidental activation of DPO procs
DEV-23028 Mac build fails - link error dual inclusion
DEV-20824 VWR-9255: Build fails on mac_updater and mac_crash_logger targets due to info.plist problems
DEV-22997 Xcode project: 'server' target has no dependencies
DEV-23353 Friend request custom messages come through as an asset tag.
DEV-23309 Voice Chat Indicator does not show active voice status
DEV-23187 Can't teleport to home location
2008-11-07 00:07:44 +00:00
Steven Bennetts afe61eb994 QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
Bryan O'Sullivan bf975f9872 VWR-8889 / DEV-20131 - Make the name of the viewer binary settable 2008-09-04 20:19:00 +00:00
Steven Bennetts 4a6bacea0f merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
2008-08-28 23:57:41 +00:00
Steven Bennetts b9b4a4d934 QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
2008-08-13 19:37:05 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
Brian McGroarty 8c7ac40358 missing contributions entry 2008-08-08 16:12:53 +00:00
Steven Bennetts 0c0391cc71 QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
2008-07-22 19:01:52 +00:00
James Cook ed386ae547 merge support-featurettes-snapshot-merge-2 for QAR-754, includes:
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4)
    * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3)
    * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771)
    * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3)

Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry

* QAR-590 Merge Lock Request for Support Sprint
* QAR-627 Merge snapshot improvements
* QAR-686 Merge Lock request for Featurettes
2008-07-18 17:50:25 +00:00
Loren Shih 6626767245 For DEV-3892/VWR-6 : Poor warning message when message template not found
Added citation to doc/contributions.txt for VWR-6 patch.  This is just a doc change, not a code change.  I verified that VWR-6 code is currently in release such that this citation is deserved.

Authorized by: Robla.
2008-07-09 21:56:19 +00:00
Steven Bennetts 926ea0b39a QAR-669 1.20 Viewer RC11
QAR-648   1.20 Viewer RC10
merge Branch_1-20-Viewer-2 -r 88724:90511 -> release
2008-06-27 21:02:01 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Steven Bennetts 875606a04d QAR-566 maint-viewer-5-merge-2
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2008-05-11 20:56:42 +00:00
Steven Bennetts 068da0b565 merge release-QAR-511 Viewer 1.20 RC 5
merge Branch_1-20-Viewer -r 85828 : 86279 -> release
2008-05-06 18:09:03 +00:00
James Cook 36fccc3888 svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 maint-ui-11-qa). 2008-04-30 23:30:09 +00:00
Josh Bell 5c51ae5a7b svn merge -r 85582:85586 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer-5-merge
QAR-500 maint-viewer-5 merge
2008-04-24 18:38:17 +00:00
Steven Bennetts 3901894708 QAR-488 Viewer 1.20 RC 2
merge Branch_1-20-Viewer -r 84760 : 85100 -> release
2008-04-23 01:04:01 +00:00
Adam Moss c01edec021 QAR-468 "Babble Lipsync MergeMe"
svn merge -c85508
svn+ssh://svn.lindenlab.com/svn/linden/branches/babble-merge1-r85500
2008-04-22 16:17:22 +00:00
Steven Bennetts a3f3ab7e11 QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
2008-04-17 02:56:14 +00:00
Steven Bennetts b5936a4b1d 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +00:00
Brian McGroarty ba9fe19a51 DEV-12322 - text file - CC By-SA 3.0 upgrade: edit LICENSE-logos.txt in bin and source 2008-03-27 23:10:30 +00:00
Brian McGroarty 25de7377c1 QAR-377 maintenance-6 merge:
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
2008-03-19 00:01:42 +00:00
Josh Bell 133a7b5fe2 svn merge -r 82272:82277 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-9-merge-2 --> release
QAR-364 - merge of maint-ui-9
2008-03-14 19:27:38 +00:00
Josh Bell a10f963900 svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui-8-merge
QAR-343 - merge maint-ui-7 and maint-ui-8 to release
2008-03-04 16:59:57 +00:00
Steven Bennetts 42bc4ba02a merge Branch_1-19-0-Viewer -r 80279 : 80947 -> release 2008-02-28 01:12:38 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Steven Bennetts 903292ba67 merge -r 78989:80279 Branch_1-19-0-Viewer-> release
Changes from 1.19.0.2 and 1.19.0.3

DEV-9226 Some Dazzle? icons have sneaked into the release branch
DEV-9226 - lock icon not appearing in properties window for no-modify inventory items
DEV-8771 Preferences > Web has truncated text in the Address: section, ported and tested minor xml change
DEV-9736 commit 1.19.0 second set of translated xui strings
DEV-9825 Make the region info message a passive notification
DEV-7714 - Korean viewer crashes on startup.
DEV-9759 - Stand up button etc dissapear offscreen after using mouselook
DEV-9938 client-readme-voice.txt missing from open source distribution
DEV-9436 Changed default SL window size to 1000x700, to allow buttons in UI to have proper labels (Communicate) and search to fit onscreen.
DEV-10031    	Clicking on another users classifieds ad then closing asks you to save changes
DEV-10066    	Checking to select a role does not enable the apply button
DEV-8809    	stray 'Done" on the Profile Web tab
DEV-8515 Debug settings overrides do not work for booleans.  svn merge -r77376:77377 sl-parcelmedia-3.  OK by cg.
DEV-10083: Preferences window docks at an offscreen position and cannot be moved vertically
DEV-10186 - LLIMPanel kills the framerate for group ims.
DEV-10108 Viewer freeze and delay in opening map
DEV-10115 Visible flashing of prim highlight when editing
DEV-10112 	Parcel audio play setting is not remembered when crossing over a parcel with no media
DEV-10109 	Alt and left/right arrow keys dont move you between tabs
DEV-10093 	Login Page > SL Release link overlaps Quit when viewer resized
DEV-10048 	Redocking the Contact list causes the communicate ui to get ugly
DEV-8131  	 Deutsch "System Default" is translated as "System Error" in language preferences
DEV-10209 - reverted floater_test.xml to empty floater.
DEV-10255 - Clicking on gestures button moves open windows
DEV-10046 	Pressing escape doesnt cause the chat history or inventory windows to lose focus
DEV-10399 -- Update required version of QuickTime library to 7.4.1 for 1.19.0 Viewer
DEV-10410 - Toggling voice causes layout problems in toolbar
DEV-8562 - Viewer crash just after login
DEV-10147 - "LLXmlTree parse failed" with settings_releasecandidate.xml
DEV-9874 - Land forsale icon in menubar overlaps pushobject restriction icon
DEV-9701 - Upload Animation window: Button missing in Stopped window state
DEV-10355 - Client crashes when viewing the proposals tab in group information
DEV-10521 My Landmarks dropdown list adds a repetition to EOF every time it's opened
DEV-10496 Groups>Proposals>Past Vote text gets chomped
DEV-10499 Defaulted buttons in floater dialogs remain highlighted when not in focus
DEV-5611 - Crash reporter appears in the background on mac (Changed launch to use open instead of direct binary call)
DEV-10704 - Crash reporter not initializing boolean, causing false exec_froze reporting (Added initilizer to constructor)
2008-02-19 23:12:34 +00:00
Josh Bell 8bd6a0b321 svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386
QAR-242 merge of maintenance-5 (QAR-203)
* DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
* DEV-7600 Deleting someone else's object in god mode crashes sim
* DEV-5329 LLSD parsers should determine and set maximum parse sizes
* DEV-7473 Resolve instant message crash report
* DEV-2904 Presence Issues not (apparently) caused by scripted attachments
* DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid
* DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory.
* DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc
* DEV-8002 c++ llsd notation parser accepts malformed data
* DEV-8001 c++ xml parse returns wrong number of elements parsed
* DEV-8089 Double delete in statc structured data parse functions
* DEV-5326 Any viewer can request presence information for any agent
* DEV-2378 python service builder does not sort query string
* DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University
* DEV-4465 Add a "logfile" command line option to the sim to create log files
2008-02-07 17:15:18 +00:00
Steven Bennetts b302f15dee EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release
ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release
2008-02-01 02:23:35 +00:00
Josh Bell 5a85e84dea svn merge -r77355:77661 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer
Pick up one last change from a deprecated viewer branch.
2008-01-28 21:47:22 +00:00
Josh Bell e7a8acadc4 svn merge -r76807:77355 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Pick up fixes made to 1.18.6 Viewer, including:

* DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports
* DEV-8384 Connect button doesn't enable
* DEV-8408 Unable to edit First/last name and password fields in viewer login
* DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
* DEV-8557 Crash on login page when using Logitech LCD Keyboard
* DEV-8507 Crash reporter has no default server to send to when crashing before agent connect
* DEV-8531 viewer_manifest.py broken for 64-bit builds
* DEV-8286 German Translation of the "Release Keys" tab is incorrect
* DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
* DEV-6851 Integrate html error page with client
2008-01-12 00:43:42 +00:00
Josh Bell e1d4097222 svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Pick up fixes for:
* DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see
* DEV-8125 Language names need to have a consistent format in preferences drop-down
* DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
* DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code
* DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces
* DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp

Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)
2008-01-03 20:00:23 +00:00
Josh Bell d06e5e3519 svn merge -r 76642:76643 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640
Redo of QAR-170, with correct range. Reviewed by CG.
2007-12-29 01:40:57 +00:00
James Cook 79680891a7 svn merge -r 76394:76651 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer to pick up LLURI escaping fix and all other changes since last sync. Not reviewed. 2007-12-28 22:19:29 +00:00
Steven Bennetts b01d567a5d EFFECTIVE MERGE: merge release@73232 maint-viewer-2@75100 -> maint-viewer-2-merge
EFFECTIVE MERGE: merge -r 74370 library-update -> maint-viewer-2-merge
ACTUAL MERGE: release@75267 maint-viewer-2-merge@75293 -> release
2007-12-07 20:27:13 +00:00
Don Kjer facf67ae32 EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
Steven Bennetts f8511d77a7 EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release
ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release
2007-12-04 16:46:00 +00:00
Steven Bennetts f41b7bb8df -74901 (back out premature commit to release) 2007-12-03 19:44:04 +00:00
Steven Bennetts d5eef2d8a6 merge -r 73391:74133 maint-ui-3 -> release 2007-12-03 19:36:44 +00:00
Josh Bell 78aec043f3 svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release 2007-11-21 02:10:12 +00:00
Brian McGroarty 788c18c00d Merge maint-viewer @ r71064 2007-10-11 19:43:20 +00:00
Don Kjer b089fc559a EFFECTIVE MERGE: svn merge -r 68999:69916 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release
** This should be the last merge from branches/maintenance.  All future merges will be from new maintenance-# branches off release **

ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-09-28 23:32:53 +00:00
Rob Lanphier 2add0e15d7 Fixing problem in credits created by the reversion of VWR-2074
It appears the credit for VWR-333 was part of that checkin, but the actual
code for VWR-333 was checked in earlier.
2007-09-20 05:55:02 +00:00
Josh Bell e3d0761b5e svn merge -r 68785:68784 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Revert change for SL-51198 ("VWR-2072: New Feature -> UI -> IM -> Teleport (other person) Button"), per Ben - more comprehensive design coming through Rx soon.
2007-09-17 16:01:11 +00:00
Don Kjer 13c391f198 EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-09-14 21:13:20 +00:00
Josh Bell b3d807d5ff svn merge -r 68690:69597 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
2007-09-13 18:17:52 +00:00
Josh Bell 6d2c503f61 svn merge -r 68474:68690 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Viewer --> release
Sync up fixes, version numbers, and release notes applied to the viewer RC branch.
2007-08-28 21:19:20 +00:00
Christian Goetze ce0a5fe145 EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
Rob Lanphier 057a5646c1 Fixing typo in contributor name (Fee Larsson->Feep Larsson) and removing another instance of Duckless VanDyke being
credited where he/she should not have been
2007-08-04 01:14:40 +00:00
Rob Lanphier 05d73c569a Duckless Vandyke did not contribute VWR-383, Thraxis Epsilon did 2007-08-04 00:24:02 +00:00
Don Kjer 9746cf5310 EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392

ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
2007-07-26 01:22:23 +00:00
Don Kjer d373dcc7cb svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
Bryan O'Sullivan fbb133a46a svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
(everything outside of indra, missing some file additions)

(josh) Original log message was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
bos updated it to be:
   svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
However, it appears it actually was:
   svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
... missing some file additions.
2007-07-18 21:25:13 +00:00
Don Kjer e5124431b5 svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-07-02 17:10:30 +00:00
Josh Bell 69383de1e7 svn merge -r 63827:63826 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Revert fix for SL-33506/VWR-53, which was causing SL-46205 "Head is invisible in appearance editor"
2007-06-25 20:08:57 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Josh Bell e61a10ec5b svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-06-04 18:46:59 +00:00
Kelly Washington 3e9872a297 merge -r61423:62602 svn/branches/maintenance --> release 2007-05-30 17:39:09 +00:00
Josh Bell ba9d38e3dd Merge all of the patches made to Branch_1-15-1 back into release:
* Release notes for 1.15.1(3)
* Updated contributors list
* Revert apr libraries (NOTE: Also done in maintenance, this should be a no-op...)
* Fix for SL-42640 Entering appearance mode triggers "items coming too fast"
* Fix for SL-42257 Mute Resident button does not open the user picker

svn merge -r 61568:61569 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61585:61586 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61601:61602 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61761:61762 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61777:61778 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61805:61806 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
svn merge -r 61824:61825 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release
2007-05-15 21:15:05 +00:00
Don Kjer 70aaa3e444 svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-04 21:57:06 +00:00
Don Kjer 1c909afe39 svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
Adam Moss 208ccf8c2c SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567,
SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource
fixes.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 ->
release
2007-04-18 09:17:53 +00:00
Josh Bell 98740db8fd svn merge -r 59826:59968 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-04 19:49:24 +00:00
Josh Bell c93c38e047 svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-03-21 19:36:11 +00:00
Adam Moss 9d3309f684 SL-35314 - fix many openjpeg woes. QA'd.
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58887
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35314-based-on-r58887
--> release
2007-03-16 11:39:49 +00:00
Josh Bell 00dbacb215 svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate@59163 --> release 2007-03-14 23:03:50 +00:00
Steven Bennetts 4dabd9c047 merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
Aaron Brashears 5cc44523f7 Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release. 2007-02-09 23:35:12 +00:00
Rob Lanphier 54d89549df Making sure there's license text distributed for the Linden Lab logos that makes it clear
we still are enforcing our trademarks
2007-02-01 06:39:06 +00:00
Jon Wolk 0fe36daf56 svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry 2007-01-10 21:54:56 +00:00
Rob Lanphier 30c9f26561 Use actual planned license header (GPL, FLOSS exception, alternative available)
Add floss exception doc
2007-01-06 01:31:14 +00:00
Rob Lanphier 0434d35c16 Adding doc directory, with GPL license in it. Adding missing libopenjpeg.a for
Darwin release.
2007-01-04 02:00:37 +00:00