summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-12-20VWR-24261: Configuration with cmake 2.8 is extremely slowAleric Inglewood
Add non-broken FindZLIB.cmake.
2010-12-16VWR-24251: Fix -DLL_TESTS:BOOL=ON on standalone when Tut is installed in a ↵Aleric Inglewood
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-15VWR-10579: Fix NDOF.cmake to do the right thing on standalone.Aleric Inglewood
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-15SNOW-240: Fix libjson naming madness, again, for standalone.Aleric Inglewood
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-15VWR-24252: On standalone, find Qt4 with find_package, and find llqtwebkit.Aleric Inglewood
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-15VWR-24247: develop.py configure still searches for the wrong header file ↵Aleric Inglewood
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-20Merge - final pull of viewer-development.Monty Brandenberg
2010-12-20merge fix for storm-412Oz Linden
2010-12-20merge fix for storm-801Oz Linden
2010-12-20merge fix for storm-796Oz Linden
2010-12-18STORM-511 FIXED Display tooltip for sender name on group notices.Vadim ProductEngine
Changes: * Set tooltip for sender name. * Overridden handleTooltip() for the tooltip to be of normal (yellow) color.
2010-12-18Merge STORM-796Vadim ProductEngine
2010-12-18STORM-796 ADDITIONAL_FIX Fixed Mac build.Vadim ProductEngine
2010-12-18STORM-412 FIXED Resident profile controls aren't reshaped on changing panel ↵Paul Guslisty
width - Added parameters for text boxes to follow right side of panel
2010-12-18STORM-801 FIXED Wrong checkbox label in panel preferences, advanced tabPaul Guslisty
- Corrected checkbox label
2010-12-17Merge from viewer-development post 2.4 releaseMonty Brandenberg
2010-12-16ESC-237 No static init of LLAtomics and move TFRequest out of unnamed namespace.Monty Brandenberg
Linux startup crash appears to be due to static/global C++ init of LLAtomic types. The initializer with explicit value makes some runtime calls and it looks like these assume, at least on Linux, that apr_initialize() has been called. So move the static POST count to a member and provide accessors and increment/decrement. Command queue was built on a pointer to a class in anonymous namespace and that's not quite valid. Made it a nested class (really a nested forward declaration) while keeping the derived classes in anonymous.
2010-12-16merge fix for storm-529Oz Linden
2010-12-16merge fix for storm-776Oz Linden
2010-12-16STORM-796 FIXED Implemented rendering /app/region/ SLapps into ↵Vadim ProductEngine
human-readable strings. Example: secondlife:///app/region/Ahern/10/20/30/ is displayed as "Ahern (10,20,30)".
2010-12-16STORM-529 FIXED Added Undo/Redo items to the Build menu.Vadim ProductEngine
2010-12-16STORM-771 FIXED Pasting wearable items from clipboard to Current Outfit or ↵Seth ProductEngine
an outfit folder now creates links to these items.
2010-12-15ESC-235 Truncation of over-sized metrics reports wasn't working.Monty Brandenberg
Legacy of the LLSD::Map-to-LLSD::Array conversion, this ended up performing an erase on the array rather than the map taking out all the regions. So, there *was* a metrics report, it was just empty of regions. Fixed and scanned for more array/map problems and corrected the data type for duration sorts (should have been Real).
2010-12-15STORM-800 FIXED Crash in LLRemoteParcelInfoProcessor::processParcelInfoReply()Kitty Barnett
2010-12-15STORM-799 FIXED Crash in LLVivoxVoiceClient::notifyStatusObservers()Kitty Barnett
2010-12-15pulling fixes back from viewer-betaOz Linden
2010-12-15STORM-776 : unable to change permissions to "no trans" on item in avatar ↵Wolfpup Lowenhar
inventory applied Kitty's code changes listed in STROM-288 as it is a related issue and this actualy fixed both issues!
2010-12-15MergeKent Quirk
2010-12-15STORM-786 ADDITIONAL FIX Fixed Windows build.Vadim ProductEngine
2010-12-15STORM-786 FIXED Fixed disappearing controls in avatar picks list.Vadim ProductEngine
Caused by an improper fix of STORM-690. Made the way we switch between profile view panels (profile view / pick_info / pick_edit) more robust. It now suits both My Profile and Profile View panels.
2010-12-14merge fix for storm-713Oz Linden
2010-12-14merge fix for storm-401Oz Linden
2010-12-14merge fix for storm-229Oz Linden
2010-12-14merge fix for storm-434Oz Linden
2010-12-14Merge CHOP-267 fixes with latest viewer-beta.brad kittenbrink
2010-12-14merge fix(es) for storm-378Oz Linden
2010-12-14STORM-352 FIXED Vertical scrollbar isn't reshaped in resident profile panel ↵Paul Guslisty
after decreasing panel height - Set height of scroll container the same as bounding panel's height
2010-12-14STORM-434 FIXED Tooltips don't appear on Mini-Location bar.Paul Guslisty
- Added localized tooltips for icons and info button in LLPanelTopInfoBar
2010-12-14STORM-713 FIXED XML/UI issues in llTextBoxPaul Guslisty
- As the class LLToastNotifyPanel is deprecated, made the class LLToastScriptTextbox derived directly from LLToastPanel. - Added callback for ignore button. Now LLToastScriptTextbox has its own XML, therefore it's not needed to dynamically create toast panel. Since LLToastNotifyPanel is deprecated all new notification toasts should be created this way.
2010-12-13STORM-766 : pull into viewer-developmentMerov Linden
2010-12-13STORM-693 : pull into viewer-developmentMerov Linden
2010-12-13STORM-636 : pull into viewer-developmentMerov Linden
2010-12-13STORM-622 : pull into viewer-developmentMerov Linden
2010-12-13STORM-431 : pull into viewer-developmentMerov Linden
2010-12-13STORM-391 : pull into viewer-developmentMerov Linden
2010-12-13STORM-401 FIXED Add recepients of teleport offers to the recent people list.Vadim ProductEngine
2010-12-13Cleanup a cross-thread command dtor. It was technicallyMonty Brandenberg
correct but looked a bit dodgy with pointer ownership.
2010-12-13STORM-781 FIXED Added support for editing multiple scripts within inventory ↵Vadim ProductEngine
of the same object using external editor. The bug was caused by using the object ID as temporary file name for editing script, which of course didn't work for multiple scripts in the same object inventory. The fix is to use MD5("object id" + "script inventory item id") for the file name.
2010-12-13STORM-229 FIXED Fixed long loading times and stalling of Viewer while ↵Andrew Productengine
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-11Update unit tests to reflect the new array-of-regions style ofMonty Brandenberg
LLSD serialization for viewer metrics.