Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,401 Commits 20 Branches 51 Tags
b865b92a6aaed9481ccdee3c98582e2ffa3519c8
Commit Graph

6401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shyotl
b865b92a6a Merge branch 'FMODStudio' 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
 2015-01-26 17:15:46 -06:00
Shyotl
2132978c41 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2015-01-26 15:26:02 -06:00
Shyotl
6e4ef6f8a1 I'll have all the derps, please. 2015-01-23 16:49:21 -06:00
Shyotl
56bd48bd2a elseif (WINDOWS AND WORD_SIZE EQUAL 32)' mistakenly clobbered. Also, try 'ProgramFiles(x86)' envvar first 2015-01-23 02:07:19 -06:00
Shyotl
ca98523c41 Cmake version bump, cleanup, typo fixes, rewrite of fmodex.cmake. 2015-01-22 02:39:45 -06:00
Inusaito Sayori
123ded50ef Oops, that should use emplace, too bad we don't have C++11. 2015-01-20 17:44:22 -05:00
Inusaito Sayori
18b7f6925a Fix/Update Inspect Tool 
Solves Issue 1131: Inspect Window while open prevents camming
Possibly fixes Issue 928: Have to Click a second time to Inspect an object, I couldn't reproduce, but maybe you still can?

Fixes a bug in the name cache connection setting of llfloaterinspect.cpp from upstream.
 2015-01-20 04:59:46 -05:00
Inusaito Sayori
51aaa9f26b LLTool Update/Sync 
Better diff against Alchemy.
 2015-01-20 04:37:32 -05:00
Inusaito Sayori
a75964c993 Move menu stuff out of lltoolmgr and into llviewermenu.cpp 2015-01-20 02:00:25 -05:00
Inusaito Sayori
9bd9cb697e Fix SLVoice erroring when log folder path has a space in it. 
Thanks to Nomade and Melissa for the help tracking this!
 2015-01-13 21:00:57 -05:00
Shibe Doge
4d29117148 Doge wuz here. Also barkies. 
░░░░░░░░░▄░░░░░░░░░░░░░░▄░░░░
░░░░░░░░▌▒█░░░░░░░░░░░▄▀▒▌░░░
░░░░░░░░▌▒▒█░░░░░░░░▄▀▒▒▒▐░░░
░░░░░░░▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐░░░
░░░░░▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐░░░
░░░▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌░░░
░░▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌░░
░░▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐░░
░▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌░
░▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌░
▀▒▀▐▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒▐░
▐▒▒▐▀▐▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
▐▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒▐░
░▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌░
░▐▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▒▄▒▒▐░░
░░▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌░░
░░░░▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀░░░
░░░░░░▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀░░░░░
░░░░░░░░░▒▒▒▒▒▒▒▒▒▒▀▀░░░░░░░░
 2015-01-13 17:31:20 -05:00
Inusaito Sayori
dd4f2e857b If we're gonna autologin, remember name too. 2015-01-13 00:52:27 -05:00
Inusaito Sayori
0b998da183 Cleanup stuffs inspired by Drake's work~ 2015-01-13 00:50:49 -05:00
Inusaito Sayori
eef7596aeb Combine renderPhysicsDisplay code loops, but don't actually fix any bugs X3 2015-01-13 00:46:20 -05:00
Inusaito Sayori
4abf23f9a9 [OpenSim] Seriously fix Issue 1791, the names thing. 
Don't leave me now, don't say it's the end of the road~
 2015-01-12 22:07:23 -05:00
Inusaito Sayori
56d2754606 Bricks in the wall 2015-01-12 21:32:29 -05:00
Inusaito Sayori
88ca93d24f Fix vivox logging borkage. 
Thankies to Drake/Alchemy~
 2015-01-12 19:16:47 -05:00
Inusaito Sayori
72c85ef104 Solve Issue 1234: Enable opening of chat logs in external editor under linux too 
Requires xdg-open, but meh~
 2015-01-12 19:14:53 -05:00
Inusaito Sayori
c6b1763d96 [STORM-1949] Add default values for ExternalEditor 
Thankies Cinder~
 2015-01-12 19:00:44 -05:00
Inusaito Sayori
844444c33b Optimize loops calling endInstances() 
Thankies to Drake Arconis/Alchemy~
 2015-01-12 18:06:49 -05:00
Shyotl
c708408f64 Linux OSS was removed from fmodstudio. Also fix issue in linux manifest. 2015-01-10 16:11:52 -06:00
Lirusaito
03e9db98e6 [OpenSim] Optimize the minimap region tile matrix implementation 2015-01-10 16:29:23 -05:00
Inusaito Sayori
bf3947dcc5 [OpenSim] Draw property lines on minimap properly for variable size regions 
This fixes Issue 1684: Minimap on Opensim Var Region showing bad the property lines

This changeset is welcome for use under LGPL.
 2015-01-10 12:31:26 -05:00
Inusaito Sayori
5140affe07 [OpenSim] Fix World Map Textures on Minimap of Variable Size Regions. 
Thanks to Shyotl for the helpies~
 2015-01-10 03:01:02 -05:00
Shyotl
b808caaa0e Appease cmake 3.1.0 2015-01-09 21:38:27 -06:00
Inusaito Sayori
658c617c75 Don't add this column twice, that's just silly. 2015-01-09 17:14:08 -05:00
Inusaito Sayori
05fcfc32bc [OpenSim] Remove unneeded code from the previous name resolution fixes 2015-01-09 15:57:24 -05:00
Inusaito Sayori
05a4409b3d Fix display names not being considered default if the display name is sent empty 2015-01-09 14:29:57 -05:00
Inusaito Sayori
cadc08af87 Remove assert for Issue 1784 (crash signature 450), it didn't fail. 
This reverts commit bb297ac354.
 2015-01-08 15:08:24 -05:00
Shyotl
2678d0f99e Trying fmodstudio as a prebuilt. (pushed to test on linux buildserver) 2015-01-08 00:49:42 -06:00
Shyotl
b1954e411b Nice typos. 2015-01-08 00:46:36 -06:00
Inusaito Sayori
5d47c7ecfa [OpenSim] Properly fix name lookups, oops~ 2015-01-07 19:02:28 -05:00
Inusaito Sayori
f09d399e88 Only spam the logs about missing var region flags when we're not on SL. 2015-01-07 15:47:14 -05:00
Inusaito Sayori
c592184aa6 Oops, uninstaller wasn't cleaning up the Portable shortcut. 2015-01-07 13:03:04 -05:00
Inusaito Sayori
bb297ac354 Add an assert for Issue 1784 (crash signature 450) 2015-01-07 00:46:01 -05:00
Inusaito Sayori
7871be05af Login entry must be a map to construct an LLSavedLoginEntry, not just defined. 
Login Screen Crash Fix.
 2015-01-06 15:33:50 -05:00
Shyotl
1a9cd725b2 boost::mutex seems slow with vs2010, so fall back to apr_mutex for it. 2015-01-06 03:56:57 -06:00
Shyotl
1e0395c26d Back to boost mutexes 2015-01-05 17:02:00 -06:00
Shyotl
7943adedaa Also need this. Last build only succeeded due to lingering obsolete entries in the cmake var cache. 2015-01-05 14:25:55 -06:00
Inusaito Sayori
2285830c8f This message ish too long now. 2015-01-04 09:55:09 -05:00
Inusaito Sayori
eff4bc7ad6 Bring back the Copy Key button and offer Copy SLURL as part of a flyout instead. 2015-01-03 22:50:55 -05:00
Inusaito Sayori
794027d91e In (readonly) combo_boxes and flyout_buttons allow use of the font attribute. 2015-01-03 22:14:53 -05:00
Inusaito Sayori
312625036b Fix max_chars on login screen, oopsie. 2015-01-03 15:50:42 -05:00
Inusaito Sayori
e7c1dc3b8e Include object key in objectiminfo floater 
General cleanup of llfloaterobjectiminfo included
Update of object im command handler code from v3
 2014-12-30 18:02:32 -05:00
Inusaito Sayori
a29b50b4cd Fix crash signature 86 
Cleans up a buncha lame code in llpanellogin.cpp
Removes some static silliness from the old days.
Removes RememberLogin because RememberName serves its purpose.
Stylistic fixups~
Removes some pointless functions.
 2014-12-30 16:49:40 -05:00
Inusaito Sayori
d03b03ac93 Fix crash signature 230 2014-12-30 14:42:13 -05:00
Shyotl
a891d2fdea FMOD(STUDIO|EX)_SDK_DIR wasn't being properly set. Change fallback on missing msvc*, as the old code made no sense (wildcarded paths don't throw when not found) 2014-12-29 18:59:15 -06:00
Inusaito Sayori
de28034c20 Feature Request: Copy URI button in avatar profiles 
This takes the copy key button's place... if this is bad, I'll figure something out down the line.
 2014-12-29 18:53:01 -05:00
Inusaito Sayori
01c639c261 Map all the people! 2014-12-29 16:52:51 -05:00
Inusaito Sayori
fe21270bbc [Radar] Attempt to fix the rare spamming of left/entered messages 2014-12-29 16:44:50 -05:00