Aleric Inglewood
f6785c399d
Added support for LLCondition to AIThreadSafeSimple.
2013-01-26 18:35:42 +01:00
Latif Khalifa
237f84cde0
Merge remote-tracking branch 'shyotl/sunshine'
2013-01-26 13:49:50 +01:00
Shyotl
485ad8e645
Reworked name loading for vivox speaker list. LLSpeaker now boost::signals2::trackable to avoid accessing after destruction. Opening new sessions via doubleclick on list(sessions managed by legacyname) or using the mute button(legacyname needed to exclude lindens) are both disabled until namecache lookup complete.
2013-01-26 01:57:13 -06:00
Lirusaito
1582bf43c5
Allow RLVa Z Offset and Vanity Body Dynamics Offset to coexist.
2013-01-25 11:26:52 -05:00
Aleric Inglewood
a1fa43850b
Comment fixes.
2013-01-25 16:09:34 +01:00
Latif Khalifa
5e799b1f81
Respect always rez under owned land group setting for objects
...
duplicated by shift-dragging or duplicating.
Based on Phoenix changeset 5b50018c63d4 by Kadah
2013-01-23 12:02:04 +01:00
Siana Gearz
5bc8102864
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-01-23 00:08:38 +01:00
Aleric Inglewood
0296812e88
Add cmake file for collada and glod.
...
This fixes standalone when those libraries are installed
elsewhere. Note that it "breaks" standalone if you just
installed the prebuilt manually. For that to work you
have to add /.../libraries/include to CMAKE_INCLUDE_PATH,
which is not recommended because it would pick up any
other prebuilt over your system installed libraries.
Instead, for standalone, install the libraries somewhere
with some prefix and then add that prefix to the environment
variable CMAKE_PREFIX_PATH.
For example, $prefix/include/collada and $prefix/lib/libcollada4dom.so
2013-01-22 20:51:43 +01:00
Latif Khalifa
d8c846288e
Merge remote-tracking branch 'lirusato/master'
2013-01-22 20:06:03 +01:00
Lirusaito
dd1e9a68d4
Removal of the deprecated lltabcontainervertical.
2013-01-22 01:38:25 -05:00
Lirusaito
36e6946c96
AuroraSim: More tiny bits to help life be normal on the grid.
2013-01-21 21:32:37 -05:00
Lirusaito
fa8e1f033b
AuroraSim: non-power-of-two support.
2013-01-21 21:32:06 -05:00
Lirusaito
415bcd2b6c
Merge branch 'master' into VarRegion
2013-01-21 21:31:34 -05:00
Lirusaito
21860ded90
Support web_profile_url response from OSGrid servers for setting WebProfileURL
2013-01-21 21:27:53 -05:00
Lirusaito
48113f8506
AuroraSim: HippoLimits and HippoGridManager update, and support for Aurora's MaxDrag
2013-01-21 21:22:04 -05:00
Aleric Inglewood
db7155666d
Merge branch 'master' into meshupload
...
Conflicts:
indra/cmake/00-Common.cmake
One diff added /MP to CMAKE_CXX_FLAGS_DEBUG while
another removed /arch:SSE2 from the same line.
Fixed to honor both changes.
2013-01-21 19:16:06 +01:00
Latif Khalifa
b758014ebc
Adjust to recent change in the API for Responder objects
2013-01-21 11:25:32 +01:00
Latif Khalifa
18816ae146
Merge remote-tracking branch 'shyotl/sunshine'
2013-01-21 11:25:10 +01:00
Shyotl
dc106c5442
Fix some compiler warnings/errors. Error in llinventorymodelbackgroundfetch was introduced by partial commit.
2013-01-20 17:10:38 -06:00
Lirusaito
aa3228be76
French translation update, thanks Nomade~
2013-01-20 10:25:19 -05:00
Lirusaito
c2ce72ed94
Issue 604: Reset Button for inventory
...
Attempted Spanish translation.
Nomade Zhao provided French.
2013-01-20 10:15:23 -05:00
Siana Gearz
4cd2de0fff
Version 1.7.3
2013-01-20 05:57:05 +01:00
Siana Gearz
b318a0703b
Use standard way on windows to find default file picker path
2013-01-20 05:55:18 +01:00
Siana Gearz
ea67aca955
This should de-clog the tubes on the map
2013-01-20 03:32:51 +01:00
Siana Gearz
0ab140a071
Potential permission fix
2013-01-20 01:49:55 +01:00
Siana Gearz
d5eb2432ef
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-01-20 01:49:14 +01:00
Lirusaito
a6c2d256c6
Hooked up RLVaTopLevelMenu setting so it actually works.
...
Changes to llviewermenu.cpp are better viewed without space changes
^Put together both RLVa Embedded and RLVa Main menus while building Advanced menu, labeling them RLVa; once the advanced menu is built and added to MenuBar, rlvMenuToggleVisible() is called.
Added onChangedMenuLevel() to rlvcommon.cpp
Added rlvMenuToggleVisible(), tweaked to only perform necessary operations for now, other parts left commented out for future use.
Removed menu visibility handling from RlvHandler::setEnabled()
NOTE: RLVa has only been updated in pertinent areas, from what I can tell we are a bit behind in other places, too.
2013-01-18 15:14:33 -05:00
Aleric Inglewood
7a8a2757db
Add comment for sake of translation.
2013-01-18 16:10:18 +01:00
Aleric Inglewood
d8d3cafc32
Merge remote-tracking branch 'singu/master'
2013-01-18 02:28:17 +01:00
Aleric Inglewood
604824335c
Keep focus during Freeze Time so that pressing ESC always leaves Freeze Time.
2013-01-18 02:26:43 +01:00
Latif Khalifa
9240147874
Merge remote-tracking branch 'lirusato/master'
2013-01-17 17:26:00 +01:00
Lirusaito
05a6323d2c
French antispam controls touchup
2013-01-17 09:17:43 -05:00
Lirusaito
1dd0b7713b
French translation fixies~
2013-01-17 03:38:53 -05:00
Lirusaito
795f70a0b0
d520053 - MAINT-852 / VWR-8761 : Cannot delete object description. Now you can.
2013-01-17 01:11:59 -05:00
Lirusaito
5831af0fb6
OPEN-161: Typo in the header guard of lltexturecache.h
2013-01-17 01:10:47 -05:00
Aleric Inglewood
e8e3e43711
Update llqtwebkit with recompiled version.
2013-01-17 00:43:21 +01:00
Latif Khalifa
460b05d37a
Merge remote-tracking branch 'shyotl/master'
2013-01-16 16:25:51 +01:00
Latif Khalifa
f03405ca47
Merge remote-tracking branch 'lirusato/master'
2013-01-16 16:25:37 +01:00
Lirusaito
0405ed9e3d
French Translation update.
2013-01-16 09:27:25 -05:00
Lirusaito
2eb8f2f84a
07e5202 MAINT-1942 Increase maximum animation length from 30 seconds to 60 seconds
2013-01-16 05:00:35 -05:00
Shyotl
6894d4c0bc
Changed how the 'client' column in avatar radar is handled. Initially was not designed nor tested to be toggleable on user-demand (was one shot deal depending on detected grid).
2013-01-15 23:14:58 -06:00
Lirusaito
53c04b7299
Issue 220: Copy/paste params in the build tools like phoenix
...
Adds mClipboardFlexiParams, mClipboardLightParams, mClipboardSculptParams, and mClipboardLightImageParams to LLPanelObject.
Corrects the tooltip on the the copy button.
2013-01-15 22:43:22 -05:00
Latif Khalifa
3bf307abb0
Merge remote-tracking branch 'shyotl/master'
2013-01-15 18:37:09 +01:00
Latif Khalifa
4928d29a8e
Merge remote-tracking branch 'aleric/master'
2013-01-15 18:36:51 +01:00
Latif Khalifa
8cec9c7b73
Merge remote-tracking branch 'lirusato/master'
2013-01-15 18:36:39 +01:00
Shyotl
a6e3352073
Setting camera toolset as current sticks us into build mode (??)... Avoid when taking snapshots.
2013-01-14 23:09:12 -06:00
Aleric Inglewood
0eeea37662
Fix 'Open floater in Freeze Time mode'
...
When the floater was opened in Freeze Time mode, then parent of the
widget that triggers it to open is the 'Floater View'. We do NOT
want to set that MouseOpaque :p. Using getParent here is just
nonsense.
2013-01-15 03:31:57 +01:00
Shyotl
2a8f55e99e
Updated gesture floater to use more modern (and actual working) method of adding list elements via xml.
2013-01-14 18:41:48 -06:00
Aleric Inglewood
db7b0c1785
Revert last part (work in progress of last two commits, I guess).
2013-01-15 00:11:17 +01:00
Aleric Inglewood
55e64f6ab0
Fix for last commit.
...
Show sculpties with no (or not enough) data as spheres with default LOD
stepping.
2013-01-14 23:53:58 +01:00
