Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,878 Commits 20 Branches 51 Tags
7ef75fef4f9e7b59ea336fa2a7e5f69e91b5feab
Commit Graph

3878 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lirusaito
b897b9427f Fix unclickable explanatory link on Outbox floater 
mOutboxInventoryPanel couldn't be setVisible(false) while it was NULL, thus it sat on top of the rest of the UI.
Set it to panel_outbox_inventory in postBuild, instead of setupOutbox.
 2012-11-14 16:48:03 -05:00
Lirusaito
c33b1004d1 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2012-11-14 13:55:48 -05:00
Siana Gearz
19e8977fff Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-11-14 19:40:45 +01:00
Aleric Inglewood
c097d650dc Don't upload partial files 2012-11-14 19:26:16 +01:00
Aleric Inglewood
b7af32bee3 Use std::istream::read instead of readsome 
According to the docs
(http://www.cplusplus.com/reference/iostream/istream/readsome/)
readsome would also set state flag eofbit, but apparently I'm
misinterpreting it.  Anyway, using read() and then gcount()
to get the number of bytes does work.
 2012-11-14 18:37:44 +01:00
Shyotl
d2422b03be Don't flush rebuild queue nor flush pending texture requests if merely performing a local teleport (eg: doubleclick teleporting within current sim.) 2012-11-13 23:34:48 -06:00
Shyotl
97d2085735 Nullcheck in LLTextureFetch::removeRequest was returning without unlocking LLTextureFetch::mQueueMutex if called via LLTextureFetch::deleteRequest 2012-11-13 23:25:32 -06:00
Aleric Inglewood
e307df79a1 Ignore the body in case of internal errors 2012-11-14 04:00:26 +01:00
Aleric Inglewood
324fe06a06 Improved printed info when curl times out. 2012-11-14 02:12:27 +01:00
Shyotl
fe15371047 Update to LLTombstone/LLHandle/LLRootHandle/LLHandleProvider. 2012-11-13 17:55:52 -06:00
Siana Gearz
fbb7196100 Missed a piece of a fix for the case we receive complete texture data instead of what we asked for. 
The rest of the fix landed in commit c37a473287 by accident.
 2012-11-13 23:54:23 +01:00
Siana Gearz
8c9a9c9d12 Introducing SGIgnoreSimulatorCameraConstraints 2012-11-13 23:46:21 +01:00
Aleric Inglewood
6f8ea87c46 Add ResponderHeadersOnly. 
ResponderHeadersOnly is a base class for responders that use
HTTPClient::head or HTTPClient::getHeaderOnly. It already
has a needsHeaders() that return true and only allows for
completedHeaders to be overridden.

I removed the CURLOPT_HEADER option for these cases, because
that only causes the headers to be send to the writeCallback
as if they are part of the body, in addition to the headerCallback;
That gave raise to some confusion for the existing code (ie,
unexpected errors when trying to decode the body as LLSD and
duplicated 'low speed' information for the Timeout policy code.
 2012-11-13 21:46:35 +01:00
Siana Gearz
3d84157325 Revert "Probably antivirus-friendlier SLPlugin" 
This reverts commit 817085c172.
 2012-11-13 18:41:58 +01:00
Siana Gearz
9abf8ddf91 Merge git://github.com/Murf/SingularityViewer 2012-11-13 18:40:20 +01:00
Lirusaito
f289d5d9e7 Make MARKET_IMPORTER_UPDATE_FREQUENCY configurable as debug setting MarketImporterUpdateFreq 
Change the default to a minute... that should be good? Right?
 2012-11-13 00:16:04 -05:00
Lirusaito
821c03a389 Copy folders support! 
Sync with v-d/rlva for Copy folder support
Also, guard against outboxy stuff, like when we're importing, don't show the Marketplace Send menu entry.
Fixed a few comments
Please view this commit with space/tab changes off! There were a lot of retabbing cases that don't need to waste anymore of anyone's time.
 2012-11-13 00:06:47 -05:00
Siana Gearz
c37a473287 Add NickyD's fast j2k metadata reader 2012-11-13 05:38:27 +01:00
Shyotl
3eebedc4c3 Revert "Avoid re-requesting object-inventory items that already have a pending request." 
This code was actually regression in viewer-dev and causes some issues.
This reverts commit cd5aa8f074.
 2012-11-12 20:32:40 -06:00
Siana Gearz
5eb99b7d2f Attempt to fix frame timer on broken mainboards 2012-11-13 02:50:15 +01:00
Brett Murphy
3534706a59 get OSX building again 2012-11-13 11:38:28 +11:00
Brett Murphy
717a8a5cdb Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer 2012-11-13 11:03:38 +11:00
Aleric Inglewood
586d8fdf21 Compile fixes for gcc 4.2 (Mac) 2012-11-13 01:01:19 +01:00
Siana Gearz
f4016c2e1c Stop trying to package dbghelp.dll - windows always comes with one anyway 2012-11-12 19:37:31 +01:00
Siana Gearz
2bb08d7638 Merge branch 'master' of git://github.com/LightDrake/SingularityViewer 2012-11-12 19:34:06 +01:00
Aleric Inglewood
155cc56632 Do not put AICurlEasyRequest in a container. 2012-11-12 18:42:55 +01:00
Shyotl
4a4032f3b8 Hopefully allows better behavior when loading other avatars. This is from v3, and taking a cursory glance, it's useful as onFirstTEMessageReceived is called before LLVOAvatar::idleUpdate, which means that mLoadedCallbacksPaused hasn't been updated for that particualr frame yet. Using LLVOAvatar::isVisible() is more accurate. 2012-11-12 03:41:53 -06:00
Shyotl
cd5aa8f074 Avoid re-requesting object-inventory items that already have a pending request. 2012-11-12 03:18:02 -06:00
Shyotl
c2b26f6c15 GCC Fixes: 
Only use C++0x/C++11 features if compiling for windows, or if GCC is configured to support such features (v4.7 onwards: '-std=c++11'. v4.3 through v4.6: '-std=c++0x')
Removed an assertion that's no longer possible to evaluate (queue doesn't support iterators).
 2012-11-12 03:04:24 -06:00
Shyotl
f25ca2ac80 Fixed small #if/#ifdef typo. Also fixed formatting error in strings.xml 2012-11-12 00:12:39 -06:00
Siana Gearz
303c74f4c9 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 
Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/newview/llvoavatar.cpp
 2012-11-12 06:46:58 +01:00
Siana Gearz
59d4d833f1 Made octree check optional 2012-11-12 04:48:00 +01:00
Siana Gearz
562acd6e2c Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2012-11-12 04:12:57 +01:00
Siana Gearz
c3d76669ca Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 
Conflicts:
	indra/llmessage/llavatarnamecache.cpp
 2012-11-12 04:12:28 +01:00
Siana Gearz
14d8d14832 Texture fetch cleanup 2012-11-12 03:33:17 +01:00
Aleric Inglewood
cdc04ba413 Merge branch 'fasttimelock' 2012-11-11 19:06:14 +01:00
Aleric Inglewood
ab91525e7a Add missing needHeaders 
The AIBufferedCurlEasyRequestEvents are not triggered unless
the derived class return true for needsHeaders().
That means, every class that implements received_HTTP_header(),
received_header() or completed_headers(), or implement
the virtual function completedHeaders(), or use the protected
member mReceivedHeaders directly.
This commits adds missing needsHeaders() for LLAvatarNameCache
(thanks Siana) and XMLRPCResponder. The former now uses
mReceivedHeaders directly instead of making a copy.
 2012-11-11 17:36:43 +01:00
Shyotl
0a4b3487ea Resolve string substitutions failing for a few 'unsuccessful' startup dialogs. 2012-11-11 01:01:04 -06:00
Aleric Inglewood
0061055e73 Attempted to dereference a past-the-end iterator. 2012-11-11 01:54:50 +01:00
Aleric Inglewood
a16c4015ba Attempted to decrement past-the-end iterator of empty container. 2012-11-11 01:54:50 +01:00
Shyotl
0173c29630 Resolve compiler warning caused by silly temporary #define. 2012-11-09 23:32:57 -06:00
Aleric Inglewood
26a734a538 Add fasttimers around obtaining a mutex or waiting on a condition. 2012-11-10 02:33:48 +01:00
Aleric Inglewood
04e7dc1270 Collect and print stats about HTTP status code 2012-11-10 02:19:20 +01:00
Shyotl
1cdc11dae2 Added LLTextureFetch::deleteAllRequests procedure. Called upon teleport. 2012-11-09 18:45:57 -06:00
Shyotl
1cb75c4471 Tiny bit of code consolidation in lltexturefetch 2012-11-09 18:42:37 -06:00
Shyotl
b6efc9f583 Fixed buggyness regarding objects moved by scripts. http://hg.secondlife.com/viewer-development/changeset/1a874cd5d0a0616b979a571e810320cd35e69baf 2012-11-09 18:41:05 -06:00
Shyotl
01868e46fe Removed pointless redundant gGL.flush() calls from llworldmapview. 2012-11-09 18:33:44 -06:00
Shyotl
313cce23db Trivial. Changed LLOcclusionQueryPool::mAvailableName to std::queue, because it's being used as a queue, and it being a list makes little sense. 2012-11-09 18:32:57 -06:00
Shyotl
9aca1f41f3 Make occlusion boundingbox 'fudge' settings adjustable via SHOcclusionFudge saved setting. 2012-11-09 18:20:45 -06:00
Shyotl
81c7445744 image->hasFetcher() check reundant in LLViewerTextureList::clearFetchingRequests(). LLViewerFetchedTexture::forceToDeleteRequest() checks for this too. 2012-11-09 18:12:57 -06:00