Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,067 Commits 20 Branches 51 Tags
09965b0cdfd12062aee06b5bb08f26835cf28c19
Commit Graph

4067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Siana Gearz
df1e9732d0 Developers, profile thy profiler! 2012-08-21 07:43:47 +02:00
Siana Gearz
822ba4432f Typo fix and MeshMaxConcurrentRequest bumped by demand 2012-08-21 07:43:00 +02:00
TighMacFanatic
8e6c6acf18 Fix issue preventing the spinner/copy/paste from working for position when editting attachments. 2012-08-20 23:54:03 -04:00
Aleric Inglewood
83b13f6a3f WIP: make everything use AICurlEasyRequestStateMachine 2012-08-20 21:18:19 +02:00
Siana Gearz
aceb3f3425 Fix playback of streams with über-long header, thx to Brett@FMOD 2012-08-20 16:09:55 +02:00
Siana Gearz
37f2ec2f9f Merge branch 'master' of git://github.com/lkalif/SingularityViewer 2012-08-20 05:16:17 +02:00
Shyotl
4d1e822de7 Fixed ancient annoyance of enabling any debug info display clobbering object hovertext. Object's real hovertext is now cached, and only substituted if overridden by setDebugText, and is properly recovered when debug text is cleared. 2012-08-20 05:10:29 +02:00
Shyotl
b8276fd8e3 MAINT-685: Fix for disabling basic shaders making high detail terrain render incorrectly. http://hg.secondlife.com/viewer-development/changeset/218a7b78dcc5f53f38de063f3a229a7462fe052f 2012-08-20 05:10:15 +02:00
Siana Gearz
d319ebc0a8 Shift-crouch-toggle is now a setting 2012-08-20 05:05:39 +02:00
Siana Gearz
5f32d9347d Place region console where people expect to find it 2012-08-20 04:41:49 +02:00
Siana Gearz
ba136fe42d Remove annoying sim version change notification - like viewer 2 2012-08-20 04:22:26 +02:00
Siana Gearz
e4090b1475 Fix up the link/unlink buttons 2012-08-20 03:31:11 +02:00
Siana Gearz
b7d2ecbf1a Able to play media again, thx VoodooSam 2012-08-20 02:34:39 +02:00
Siana Gearz
f77f846c8d Anim upload issues fixed, bulk upload clarified. 2012-08-19 23:58:10 +02:00
Siana Gearz
23b34aeb92 Fix FMOD Ex packaging 2012-08-19 19:04:22 +02:00
Damian Zhaoying
59c887129d Merge remote-tracking branch 'upstream/master' 2012-08-18 18:50:17 -03:00
Lirusaito
bd7cd9245a A tiny sync with v-d in LLGLSandBox/LLViewerParcelMgr 2012-08-16 09:21:46 -04:00
Latif Khalifa
53c7cf116c Implement setting home position the way V3 does it, with CAP fallback 2012-08-16 08:00:42 +02:00
Siana Gearz
95b7842e31 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2012-08-16 03:46:32 +02:00
Siana Gearz
0b953ccc40 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer 2012-08-16 03:37:50 +02:00
Siana Gearz
41c4eabcaa Merge branch 'master' of git://github.com/lkalif/SingularityViewer 2012-08-16 03:37:34 +02:00
Siana Gearz
0a33a3a71a This should at least stop crash from pathfinding notification till we have figured it out better. 2012-08-16 03:37:13 +02:00
Shyotl
d6b470cd07 Just call LLPipeline::refreshCachedSettings() in LLViewerShaderManager::setShaders() to avoid occlusion-related crashes if certain shaders failed to load. 2012-08-15 16:21:10 -05:00
Lirusaito
d1cb627582 What started out as removing the newline spam in LLPanelObject, ended as cleanup/sync with v-d. 
Jus' want files to be nice to read, but then... a bunch of them are all messy.. so... Fixed~
 2012-08-15 10:00:47 -04:00
Lirusaito
1d99158562 newview/CMakeLists.txt alphabetized and brought closer to v-d. 
Yay cleaning~
 2012-08-15 02:10:10 -04:00
Aleric Inglewood
05c32c7a62 Merge branch 'curlthreading2' into curlthreading3 2012-08-15 05:44:17 +02:00
Aleric Inglewood
ea4d32b4ad Compile fix. 2012-08-15 05:43:12 +02:00
Lirusaito
bb9e260793 LLViewerMenuFile, missed a spot with translation. 
Also rearranged includes, for better sync with upstream v-d...
 2012-08-14 19:47:39 -04:00
Aleric Inglewood
536cb6febd Merge branch 'curlthreading2' into curlthreading3 
Conflicts:
	indra/CMakeLists.txt
	indra/llcommon/llstring.h
	indra/llmessage/CMakeLists.txt
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
 2012-08-15 00:51:40 +02:00
Latif Khalifa
258fe8bad0 Fixed region windlight on OpenSim. It's not possible to assume that the mere existance of M7WL should mean override of RegionWindlight as M7WL is always sent. If M7WL is to have a preference some other method must be devised, ie. a debug setting 2012-08-14 21:30:25 +02:00
Latif Khalifa
74772a1f61 One should never invoke CAPs request without checking if the capability is present. Fixes setting home location on OSGrid, issue #426 2012-08-14 19:30:49 +02:00
Siana Gearz
bdaa5f20a1 Auto detach Firestorm bridge 2012-08-14 08:11:15 +02:00
Aleric Inglewood
19293601b3 Manual pick of stuff from 'shycurl' (68ad5411) that seemed to make sense. 2012-08-14 02:38:06 +02:00
Shyotl
f2bcfa5275 Use cachedcontrol in LLViewerObjectList::update. 2012-08-13 18:51:37 -05:00
Siana Gearz
6265027222 Commonly requested resolutions for HD monitors 
Totally wish i had that last one! Wheeee, SPAAAACE!
 2012-08-14 00:35:53 +02:00
Siana Gearz
36ff4dcd11 Don't feed empty, non-working callback to CURL 
Cherry-Pick of 96a4e16a

Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp

Clear reasons for conflicts, resolved.
 2012-08-13 23:33:49 +02:00
Aleric Inglewood
35a53ef1d7 Bug fix (needed for libcwd with memory allocation debugging) 2012-08-13 21:59:57 +02:00
Siana Gearz
507c5eb7ca Fix classified search 2012-08-13 21:50:09 +02:00
Aleric Inglewood
169670a58b Refurbish last merge. Fix compile for standalone and libcwd. 2012-08-13 19:30:35 +02:00
Aleric Inglewood
fbb5dced97 Merge remote-tracking branch 'singu/master' into curlthreading2 
Conflicts:
	indra/llcommon/CMakeLists.txt
	indra/llmessage/llcurl.cpp
	indra/llmessage/llcurl.h
	indra/llmessage/llhttpclient.cpp
	indra/llmessage/llhttpclient.h
	indra/llmessage/llpumpio.cpp
	indra/llmessage/llpumpio.h
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp
	indra/newview/llappviewer.cpp
	indra/newview/llspatialpartition.cpp
	indra/newview/llviewermedia.cpp
	indra/newview/llxmlrpctransaction.cpp

Conflicts resolved by choosing curlthreading2
for any llmessage file regardless (which looks
correct upon investigation); the rest also
turned out to need to use curlthreading2, except
in one line where I added a semi-colon after
an assert(), and the assert was changed in
singu/master.
 2012-08-13 17:07:25 +02:00
Shyotl
aa54a386f3 Fix regression introduced in pathfinding (avelocity bugs) 2012-08-13 02:55:47 -05:00
Siana Gearz
6b8c58e3b5 Safe and probably pointless crash workarounds from FS and LL 2012-08-13 06:14:16 +02:00
Lirusaito
67f4797e09 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-08-12 22:58:22 -04:00
Siana Gearz
7335ae548c Add script teleport permission 2012-08-13 03:04:33 +02:00
Siana Gearz
0b1a5bc3c1 Translation file clean-up 2012-08-13 02:23:08 +02:00
Siana Gearz
e9c54bb5e4 Fix voice icon in chat floater tab 2012-08-13 01:56:35 +02:00
Siana Gearz
4294038271 Potential HTTP fixes from viewer-http 2012-08-12 22:39:33 +02:00
Lirusaito
408eab13f0 Removed a duplicate string 2012-08-12 16:04:22 -04:00
Siana Gearz
ee0bd9ee76 De-uglify graphics preferences 2012-08-12 20:52:57 +02:00
Aleric Inglewood
263a25fb87 Compile fix for DEBUG_CURLIO 2012-08-12 17:42:30 +02:00