Aleric Inglewood
9b930c8716
Don't set a SSL ctx callback when we don't use openSSL.
2014-08-26 19:19:06 +02:00
Aleric Inglewood
eb0d2e5b2c
libcurl-gnutls.so (debian) links with libgnutls.so
...
In that case we DO reach the assert here.
I verified that curl_global_init() indeed calls gnutls_global_init().
2014-08-26 01:35:13 +02:00
Aleric Inglewood
5e2722475a
This header uses LLMatrix4a, not LLMatrix4.
2014-08-26 00:29:59 +02:00
Aleric Inglewood
b1e406731d
Merge remote-tracking branch 'singu/master'
2014-08-25 18:39:46 +02:00
Aleric Inglewood
8c6d51cb71
No longer support DEBUG_CURLIO when libcwd isn't installed.
2014-08-25 17:58:45 +02:00
Shyotl
09a6a1f259
Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git
2014-08-23 01:37:48 -05:00
Shyotl
315618a18b
Fixed materials specularmap + glossiness=0 combination.
2014-08-23 01:34:25 -05:00
Inusaito Sayori
59af03695b
Fix debug settings boolean to work with the radiogroup update.
2014-08-23 00:24:57 -04:00
Inusaito Sayori
e1851f7b5b
Sync llwindowwin32 with Alchemy.
2014-08-22 21:47:52 -04:00
Inusaito Sayori
a126b4003f
Fix the first double click of every session failing.
2014-08-22 21:43:48 -04:00
Inusaito Sayori
9067de26ac
Seriously, what is logic?
2014-08-22 17:32:28 -04:00
Inusaito Sayori
260c5345fd
Logic, what's that?!
2014-08-22 16:16:08 -04:00
Inusaito Sayori
e3dd05ef21
Fix the broken radio groups
...
Now can I go to sleep, Papa?
...
But I did my chores and fixed the bugs.
...
YAY! *runs off to bed*
2014-08-22 07:14:19 -04:00
Inusaito Sayori
9379bcedf9
A propos de [SHORT_APP_NAME]
2014-08-22 06:02:03 -04:00
Inusaito Sayori
2c91210d6e
Is almost zero approximately zero?
2014-08-22 06:01:45 -04:00
Shyotl
f721d935e4
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
2014-08-22 03:55:21 -05:00
Shyotl
66597cade3
Use [SHORT_APP_NAME] xui/de/floater_about.xml as per liru request.
2014-08-22 03:52:13 -05:00
Shyotl
3c5f39e26a
Use a dynamic buffer for LLMeshHeaderResponder.
2014-08-22 03:41:00 -05:00
Shyotl
24e3176f1b
Fixed some odd initialization oddness in develop.py. Also changed win64 build targetdir to build-vc###-Win64
2014-08-22 03:38:49 -05:00
Shyotl
e59757e3e8
Clean up a few harmless compiler warnings (signed/unsigned, double to float)
2014-08-20 19:43:32 -05:00
Shyotl
282de8c7f5
Only use LLAvatarJoint when necessary, else LLJoint
2014-08-20 19:40:31 -05:00
Shyotl
541021f29c
Fix relwithdebug.
2014-08-20 17:42:48 -05:00
Inusaito Sayori
e01b9dcd39
If it's not a translation, don't change APP_NAME and related strings in strings.xml
2014-08-19 20:06:43 -04:00
Inusaito Sayori
8d4567b930
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2014-08-19 19:55:34 -04:00
Inusaito Sayori
6f6988a487
Add "Move to Lost And Found" option for displaced inventory
...
Inspired by the work of Kitty Barnett
Fixes Issue 1337: Corrupted Inventory
Fixes Issue 1625: Unattainable inventory is Outside of My Inventoy and no options to move back to My Inventory
Fixes Issue 1580: Deleted folders showing outside of inventory folder.
2014-08-19 19:52:24 -04:00
Inusaito Sayori
435ab2ce77
Modernize llradiogroup, allows v3-style attributes: value, label for radio_item; allow_deselect for radio_group.
...
LLRadioCtrl moves into llradiogroup.cpp
2014-08-19 19:42:42 -04:00
Shyotl
1afd723c4e
Post-merge fixup.
2014-08-19 01:36:24 -05:00
Shyotl
b09f7f5ac7
Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git
...
Conflicts:
indra/newview/llviewerobjectlist.cpp
indra/newview/llviewerpartsim.cpp
2014-08-18 23:55:03 -05:00
Shyotl
1b3f0f9ec0
Manual texture reloading now re-fetches materials-related textures.
2014-08-18 23:47:37 -05:00
Shyotl
d1d68721ac
Pulled mesh header info parsing and VFS fetching into their own procedures to remove duplicate code.
2014-08-18 17:16:45 -05:00
Inusaito Sayori
2f4afe5b68
Fix About [APP_NAME] to read About [SHORT_APP_NAME]
2014-08-18 17:58:45 -04:00
Shyotl
47fcc70756
Write initial mesh data to file in larger chunks. Reduces file i/o stalls.
2014-08-18 00:54:46 -05:00
Shyotl
0e86b696c5
Added more verbose statemachine debug output.
2014-08-18 00:54:01 -05:00
Shyotl
54f05b409c
Always use dynamic_cast when casting from an LLJoint*
2014-08-13 18:04:24 -05:00
Inusaito Sayori
350dff9b98
Cinder made some logic enhancements to hippogridmanager.cpp, I've picked them up~
2014-08-13 02:34:52 -04:00
Inusaito Sayori
f198221812
System preferences and Menu translation updates by Nomade Zhao.
2014-08-13 02:04:17 -04:00
Inusaito Sayori
dee08b4216
Spanish translation pruning, also Manage ban list translation by Damian.
2014-08-13 02:02:34 -04:00
Damian Zhaoying
e02d074a85
Merge remote-tracking branch 'Liru/master'
2014-08-11 18:25:32 -03:00
Damian Zhaoying
8e2da87b97
Update spanish translations to reflect a lot of changes and adds in last Alphas builds.
2014-08-11 18:22:34 -03:00
Inusaito Sayori
2deba06212
Missed a spot with the date column for group bans
...
I'm thinking of putting a setting here instead of hardcoding the date format, actually, but for now this is good enough.
2014-08-11 14:36:37 -04:00
Latif Khalifa
a6ac8e1f71
Workaround for clang bugs
2014-08-09 11:24:22 -04:00
Inusaito Sayori
69436a9032
Add french translation for connect to neighboring regions from Nomade Zhao
2014-08-09 10:50:24 -04:00
Inusaito Sayori
50d91d13be
Allow dragging and dropping to attached objects
...
There's now a guard serverside that'll prevent the situation that would cause things to break in the past, so there's no reason not to have this.
2014-08-08 16:26:40 -04:00
Inusaito Sayori
54a6db146e
Upon further consideration and a bit of feedback, the new matching common characters behavior of gesture autocomplete is probably bad, I've commented it out and brought back the old code.
2014-08-08 14:57:14 -04:00
Inusaito Sayori
3b31fe91a6
Address Deltek's concern that the Open Attachment button wasn't changing text to just say save when the object is not the openable type.
2014-08-08 14:52:52 -04:00
Inusaito Sayori
90c5219be9
Move Media Filter from the View menu to the Singularity menu.
...
Moves Media Filter in all translations, no need for translators to worry~
Nomade, please translate the Singularity menu at your discretion.. in menu_viewer.xml
2014-08-08 08:43:24 -04:00
Inusaito Sayori
669fe29173
Initialize members of LLMediaFilter, fixes win64 filter being broken.
2014-08-08 08:26:48 -04:00
Inusaito Sayori
d7d06c8234
Oh, and this one too, maybe it is fixed now?
2014-08-08 07:07:51 -04:00
Inusaito Sayori
4754c1322d
This should probably be a size_t, perhaps this fixes the win64 mediafilter bug.
2014-08-07 21:56:25 -04:00
Inusaito Sayori
acb093c277
Media Filter code cleanup
2014-08-07 20:37:03 -04:00