Commit Graph

4118 Commits

Author SHA1 Message Date
Aleric Inglewood
0b86c9eec1 Merge remote-tracking branch 'singu/master'
Conflicts:
	indra/newview/llviewerwindow.cpp

c_str() dropped out (50f03d83c0).
Added it back.
2013-04-20 05:18:27 +02:00
Aleric Inglewood
e12aaa3f5f Compile warning fix. 2013-04-20 05:06:30 +02:00
Aleric Inglewood
9fb3fe21bc Compile warning fix. 2013-04-20 05:03:17 +02:00
Aleric Inglewood
e0aa3489f8 Fix for AIStateMachineThread (LLThreadSafeRefCount: deleting non-zero reference)
This fixes
https://code.google.com/p/singularity-viewer/issues/detail?id=736

The problem was that we need to keep the 'user' derived THREAD_IMPL
alive in the thread, and therefore used an LLPointer<THREAD_IMPL>
(as base class of AIStateMachineThread<THREAD_IMPL>), and therefore
THREAD_IMPL, derived from AIThreadImpl had to be derived from
LLThreadSafeRefCount. However, AIStateMachineThread<THREAD_IMPL> also
needed to be a statemachine of itself and is derived from
AIStateMachineThreadBase derived from AIStateMachine which is ALSO
derived from LLThreadSafeRefCount - that in this case wasn't really
needed. An attempt to deactive it by calling ref() from the constructor
of AIStateMachineThreadBase failed on the fact that LLThreadSafeRefCount
insists that its ref count mRef is exactly zero when it is being
deleted.

The chosen solution is to remove the ref count from AIThreadImpl and use
the LLThreadSafeRefCount base class of AIStateMachineThreadBase. The
result is that not only THREAD_IMPL, but also the state machine object
is kept alive, but that doesn't seem like a problem.

Thus, instead of passing a AIThreadImpl* to
AIStateMachineThreadBase::Thread, we now pass a
AIStateMachineThreadBase* to it to keep the whole of the
AIStateMachineThread<THREAD_IMPL> object alive, which has a THREAD_IMPL
as member now. This member then can be accessed through a virtual
function impl(). Another result of this change is that the 'user' (the
class derived from AIThreadImpl, THREAD_IMPL) now has to deal with the
LLPointer, and use LLPointer<AIStateMachineThread<THREAD_IMPL> >
instead of just AIStateMachineThread<THREAD_IMPL> and also allocate
this object himself. The access from there then changes into a -> to
access the state machine (as opposed to a .) and ->thread_impl() to
access the THREAD_IMPL object (as opposed to a ->).
2013-04-20 04:28:23 +02:00
Latif Khalifa
3bdeb8e8a8 TEMPORARILY disable erroring out during mesh upload 2013-04-20 00:28:36 +02:00
Lirusaito
b8d2bd578c French translation update 2013-04-19 23:59:18 +02:00
Lirusaito
6c93dc1d82 Update LSL information (Adds new AnimationOverride) 2013-04-19 23:59:05 +02:00
Shyotl
733b8e75ac Less prim peekaboo antics. 2013-04-18 23:44:25 +02:00
Latif Khalifa
7e66eb08cf Merge remote-tracking branch 'shyotl/master' 2013-04-18 23:24:40 +02:00
Lirusaito
b51615be20 Support Legacy Region/Estate Environment
Also Disable Environment Tab when the cap required to use it isn't supported.
2013-04-18 23:24:30 +02:00
Shyotl
0261f13670 LLSliderCtrl callbacks actually get the child LLSlider object, not the LLSliderCtrl object. 2013-04-18 16:02:10 -05:00
Melanie
ceade84fb0 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-04-18 06:04:30 +02:00
Melanie
765a4749c9 Allow the octopus to set a channel at floater level to disambiguate between simultaneously open floaters 2013-04-18 05:15:34 +02:00
saphira
50f03d83c0 Fix SuSe Linux build break 2013-04-18 00:44:50 +02:00
Latif Khalifa
110f502960 Merge remote-tracking branch 'shyotl/master' 2013-04-16 17:50:26 +02:00
Shyotl
11358746da Use legacy function pointer for old legacy setTextEntryCallback signature. 2013-04-16 10:49:56 -05:00
Latif Khalifa
e2a9d83b3e Merge remote-tracking branch 'melanie_t/master' 2013-04-16 17:35:44 +02:00
Melanie
0909bf1133 Remove the spammy leftover debug message. Thought I'd done that already... 2013-04-16 14:07:34 +02:00
Melanie
a2f7bee568 Extend the octopus to allow avatar pickers to be used. 2013-04-16 13:32:35 +02:00
Latif Khalifa
97809b3a22 Merge remote-tracking branch 'melanie_t/master' 2013-04-16 12:53:37 +02:00
Melanie
ab2f06d64e Add some much needed parens 2013-04-16 12:50:22 +02:00
Melanie
ab29c73ff5 Hide the export check boxes when on SL. 2013-04-16 12:35:02 +02:00
Melanie
f960a79118 Kill some compiler warnings by removing three unused locals that were in there for debugging 2013-04-16 07:41:12 +02:00
Shyotl
4cbf8b16b6 Streaming FBO checkbox in preferences->graphics->advanced enable switch was inverted due to vbo rebuild being deferred to a later frame. 2013-04-16 00:21:12 -05:00
Latif Khalifa
c1d5f33a4c Merge remote-tracking branch 'shyotl/master' 2013-04-16 06:36:13 +02:00
Shyotl
f52b97d588 Fix llalertdialog.cpp (accidentally grabbed some changes that only work with future alterations I've yet to push to master.) 2013-04-15 23:29:51 -05:00
Melanie
158a434899 Set focus in all necessary ways, not just the keyboard alone, when tabs are changed by alt-arrows 2013-04-16 05:45:27 +02:00
Shyotl
fed6639e44 Renamed SHAlphaMaskMaxRMSE to SHAutoMaskMaxRMSE. Disabled alpha masking on attachments. 2013-04-15 18:16:12 -05:00
Shyotl
75c1e74e48 Avoid using invalid iterator in LLNotifications::getChannel if channel is not found. 2013-04-15 18:12:15 -05:00
Shyotl
70e008bf98 Fix some subtle bugs in llrender. 2013-04-15 18:10:38 -05:00
Shyotl
e22e8d92b8 Disable AA when drawing ui. 2013-04-15 18:09:00 -05:00
Shyotl
d51b0f8701 Tweaked alert dialogs. Clicking 'x' issues a response. Either 'close', 'cancel', 'ok' or a dummy 'close' which will result in LLNotification::getSelectedOption returning -1 in callback. Listed in order of preference. 2013-04-15 18:06:46 -05:00
Latif Khalifa
adb535421d Fixed build with DEBUG_CURLIO defined 2013-04-13 22:08:19 +02:00
Latif Khalifa
3a54d4b4ab Fixed windows build in debug mode 2013-04-13 22:07:45 +02:00
Melanie
0b70e32f15 Remove spammy debug - that part works now 2013-04-13 20:03:16 +02:00
Lirusaito
6f027c5535 commitCallbacks have the new value built in, let's not bother with childGetValue for the export check =^*^= 2013-04-13 20:03:05 +02:00
Lirusaito
2bc966ad24 Condensed export mask checks into boolean functions
Thins out that overly thick block of checks in the middle of LLPanelPermissions::refresh
Also corrected incorrect log output, after First stage comes contents not textures, Melanie.
2013-04-13 20:02:51 +02:00
Lirusaito
09e7017f06 Added handleVisibilityChange to LLPanelPermissions
TODO: Find out if this change is worthwhile by checking for log spam
2013-04-13 20:02:40 +02:00
Melanie
eacd1d7eb9 Fix export permission checks to look for face textures by asset ID 2013-04-13 20:01:57 +02:00
Melanie
469ef079b9 Fix export enable controls 2013-04-13 20:01:49 +02:00
Melanie
121de1fc12 Fix debug permissions display to show the transfer permission again. 2013-04-13 20:01:38 +02:00
Lirusaito
345c5c751c Space changes 2013-04-13 20:00:38 +02:00
Lirusaito
fd76b7bf20 Added simSupportsExport function
Hide E and export checked from regions without export support
No longer allow PERM_EXPORT from being added to default everyone permission flags if it's not supported by the sim.
2013-04-13 20:00:17 +02:00
Lirusaito
7e7190ce6e Such a silly mistake it's "checkbox allow export" not "checkbox export" 2013-04-13 19:59:47 +02:00
Lirusaito
5a8ab82257 Bit more cleanup in llpanelpermissions.cpp 2013-04-13 19:57:24 +02:00
Lirusaito
fec3b6c79f Space changes 2013-04-13 19:57:17 +02:00
Lirusaito
dd711d51c0 Clean up in llpanelpermissions.cpp 2013-04-13 19:57:08 +02:00
Lirusaito
d5e6f9950d Add Allow exportation checkbox to Default Upload Permissions floater.
Setting is per account and defaults to false.
2013-04-13 19:55:50 +02:00
Lirusaito
e7cf0b716d Permissions corrections. 2013-04-13 19:55:37 +02:00
Lirusaito
d269b66623 Space changes. 2013-04-13 19:54:41 +02:00