Shyotl
ce3511f7ea
Misc changes via v3 merge. Nothing big.
2012-12-03 15:03:52 -06:00
Shyotl
a8e1bd1538
'Save scripts in inventory as Mono scripts instead of LSL2' checkbox was not functioning. For whatever reason it was not implemented in the actual panel, and referenced the incorrect setting. The proper setting will be 'SaveInventoryScriptsAsMono' not 'SaveScriptsAsMono'
2012-12-03 11:33:24 -06:00
Shyotl
0554ecae5c
Added explicit texture reloading. Accessable in the 'tools' submenus for the agent, avatars, and selected objects.
2012-12-02 17:06:54 -06:00
Shyotl
8b19f82c0b
Trivial changes. Resolved some sign mismatch warnings, and now using LLCachedControl for 'SGIgnoreSimulatorCameraConstraint' setting lookup.
2012-11-29 11:58:41 -06:00
Shyotl
794dbacea3
Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into testpit
...
Conflicts:
indra/newview/lldrawpoolavatar.cpp
indra/newview/llviewertexturelist.cpp
indra/newview/llworldmap.cpp
indra/newview/pipeline.cpp
2012-11-29 11:54:41 -06:00
Shyotl
3a4b6cf6b6
Hovertext updates marked objects as 'moved' when inappropriate. http://hg.secondlife.com/viewer-development/commits/8ccf2b0fa3857a6610f6ea03166e5a4494ca6d03
2012-11-29 10:07:25 -06:00
Shyotl
c0c9c51e43
Some minor syntax grooming in LLNetMap::draw
2012-11-29 10:03:48 -06:00
Aleric Inglewood
e17405d80a
Fixed snapping of rotation in the edge-on case
...
Patch by https://codereview.secondlife.com/users/cron.stardust/
Jira: https://jira.secondlife.com/browse/STORM-1919
2012-11-28 17:04:24 +01:00
Shyotl
5e6ed2dc9f
Large update to the worldmap. Essentially, v3 merge, and reimplemented legacy tile drawing and opensim-specific changes. Also added a diagnostic view.
2012-11-24 11:21:29 -06:00
Shyotl
adebc36bc7
Cheap workaround for osgrid giving us an invalid pure-white single-channel opaque water texture. First it purges the texture from the cache and attempts to refetch, and if it's still invalid it falls back to the transparent water texture (which won't actually be transparent due to blending being disabled). Also fixed some annoying console spam related to null textures, and also now using the correct glTexGen* function. More details in comments.
2012-11-24 01:00:25 -06:00
Shyotl
6b473c6edc
Avoid clearing hud object rebuild states when teleporting.
2012-11-18 02:42:33 -06:00
Shyotl
9d8f31a0cb
Some teleport reworking. Don't clear rebuild groups/resetVBO unless tp screen is up, or we've just changed sims. Also skip updateUI drawing if tp screen is up.
2012-11-18 02:41:37 -06:00
Aleric Inglewood
f8bf11d574
More clearly state the implications of the NoVerifySSLCert debug option
2012-11-15 14:14:25 +01:00
Siana Gearz
19e8977fff
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2012-11-14 19:40:45 +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
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
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
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
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
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
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
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
Shyotl
d54daa19a0
Allow trial of trasform feedback (for testing/benchmark) on hardware that declares support for GL_EXT_transform_feedback. Performance is far less than satisfactory on my hd4870(ogl3.3 gpu), however. Also messes up texcoords. Don't add RenderUseTransformFeedback to settings.xml.
2012-11-09 18:10:39 -06:00
Shyotl
0c58a42b08
Added a couple needed nullchecks of gAgentAvatarp in LLAgent.
2012-11-09 16:32:26 -06:00
Aleric Inglewood
68cbf31c8b
Add a PerHostRequestQueue object.
...
Adds a std::map for hostname (or urls) --> PerHostRequestQueue
objects. The latter keeps track of the number of added curl easy
requests and decides if a new request should be throttled or
not, as well as provides the queue to queue throttled requests.
At the moment CurlConcurrentConnectionsPerHost is set to 16,
because things really don't work without LL supporting connection
reuse if we limit it to 2. CurlConcurrentConnectionsPerHost is
also set to non-persistent so that we can easily change it in the future
(once we decide on it's final value it can be set to persistent).
2012-11-07 15:41:50 +01:00
Lirusaito
d518222340
Disable Group Fee Invites in antispam preferences, when appropriate.
2012-11-06 21:35:35 -05:00