Melanie
37f3695e78
Merge branch 'master' into Avination-4.0
2013-04-20 06:40:51 +02:00
Melanie
1849b5ba1e
Add isAvination() function to hippo grid manager
2013-04-20 06:40:16 +02:00
Melanie
2d717dcf17
Merge branch 'master' into Avination-4.0
2013-04-20 03:13:18 +02:00
Melanie
f83717255f
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-04-20 03:13:00 +02:00
Melanie
d593ebfa34
Add another menu insert point in the admin menu.
2013-04-20 03:12:49 +02:00
Melanie
35544cac74
Add another menu insert point in the admin menu.
2013-04-20 03:12:12 +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
63b7b6ddc9
Merge branch 'master' into Avination-4.0
2013-04-18 06:04:52 +02:00
Melanie
ceade84fb0
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-04-18 06:04:30 +02:00
Melanie
4cf8780711
Merge branch 'master' into Avination-4.0
2013-04-18 05:19:15 +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
Melanie
5d3f50c307
Merge branch 'master' into Avination-4.0
2013-04-18 00:45:10 +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
Melanie
88ef66f90f
Merge branch 'master' into Avination-4.0
2013-04-16 17:49:49 +02: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
2803c4ddf6
Merge branch 'master' into Avination-4.0
2013-04-16 13:33:41 +02:00
Melanie
a2f7bee568
Extend the octopus to allow avatar pickers to be used.
2013-04-16 13:32:35 +02:00
Melanie
12b98eedbe
Extend the octopus to allow avatar pickers to be used.
2013-04-16 13:20:24 +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
a52fdd0dd0
Extend the octopus to allow avatar pickers - step 1
2013-04-16 12:15:43 +02:00
Melanie
f921e551a2
Merge branch 'master' into Avination-4.0
2013-04-16 07:44:55 +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
e897fbcea5
Merge branch 'master' into Avination-4.0
2013-04-16 05:46:43 +02: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
Melanie
09965b0cdf
Add support for Avination's "Upload Credits"
2013-04-15 15:55:46 +02: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
