Commit Graph

4889 Commits

Author SHA1 Message Date
Salvatore La Bua
c0961e9760 Remove unnecessary listeners for the MiniMap
New class ToggleControl is used in place of the removed listeners.
Much cleaner code for the MiniMap chat rings.
Remove redundant debug setting: MiniMapChatRings.

-Thanks Liru for the advices.
2013-09-30 22:21:11 +02:00
Salvatore La Bua
ddae988aa5 Minor change in class listing order in llnetmap.h 2013-09-30 12:27:33 +02:00
Latif Khalifa
5817040956 Merge branch 'master' of https://github.com/slabua/SingularityViewer 2013-09-29 17:34:55 +02:00
Salvatore La Bua
8f9de319bf Use correct matrixMode to draw chat rings, thanks LightDrake 2013-09-29 17:31:17 +02:00
Inusaito Sayori
aa14bcc754 [VarRegions] Permanently guard against Issue 1125 sneaking back in, as best we can. 2013-09-29 11:14:57 -04:00
Inusaito Sayori
da0a092d42 [VarRegions] Fix Issue 1125: Chat Window Links open up browser 2013-09-29 11:14:00 -04:00
Aleric Inglewood
227c621dad Merge remote-tracking branch 'slb/master'
Conflicts:
	indra/newview/llnetmap.cpp
	indra/newview/llnetmap.h
	indra/newview/skins/default/xui/en-us/menu_mini_map.xml
2013-09-29 16:56:55 +02:00
Sean Devin
ffc44a7010 Implemented right click option on MiniMap to hide or show objects 2013-09-29 15:56:38 +02:00
Salvatore La Bua
af1480615f Add optional chat ranges rings on MiniMap
Ability to show Whisper, Chat and Shout range circles on the MiniMap.
Range values are at the moment hardcoded as [10, 20, 100].

Each ring is binded to the following Debug Settings:
Whisper ring:	MiniMapWhisperRing
Chat Ring:	MiniMapChatRing
Shout Ring:	MiniMapShoutRing

Each ring colour can be customised through the following Debug Settings:
Whisper ring:	MiniMapWhisperRingColor
Chat Ring:	MiniMapChatRingColor
Shout Ring:	MiniMapShoutRingColor

The following Debug Setting is used to enable/disable all the rings at once:
MiniMapChatRings
2013-09-29 14:53:51 +02:00
Salvatore La Bua
6b26561605 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-09-29 02:06:32 +02:00
Latif Khalifa
1e7f984ce6 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-09-29 01:34:00 +02:00
Aleric Inglewood
1ef90525b7 Add support for GetMesh2
Tested that it's actually being used - and it seems to download
everything at high speed. Certainly an improvement.

Textures are still *requested* in the wrong order though; for
example - baked textures are simply not requested for a long time -
while they are even downloaded from another service!
2013-09-29 01:00:30 +02:00
Salvatore La Bua
aa4bee448d Remove unnecessary CommitCallback 2013-09-29 00:01:11 +02:00
Aleric Inglewood
1c0f87d82f Let curl follow redirects by default.
Turns out that the only responders that want to get the redirect
status codes themselves are the ones that already had a
redirect_status_ok() exception.
2013-09-28 20:41:10 +02:00
Inusaito Sayori
af36d63975 Remove duplicate entries from message_prehash.h 2013-09-28 11:34:57 -04:00
Latif Khalifa
b5ba5b8d3a Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-09-28 16:23:28 +02:00
Salvatore La Bua
b4cdd2c175 Enable Client tags on a new line by default
Change default value for SLBDisplayClientTagOnNewLine to 1
2013-09-28 16:18:52 +02:00
Salvatore La Bua
792cc12ebc Comment out an unused variable e_state_name[] in lltexturefetch.cpp 2013-09-28 05:38:09 +02:00
Salvatore La Bua
df7c60de35 Add option to show Client tags on a new line
The checkbox is available in Preferences > Vanity > Tags/Colors.
Debug Setting: SLBDisplayClientTagOnNewLine
2013-09-28 05:32:54 +02:00
Salvatore La Bua
afe0f7ef3d Revert "Trees shadow parameters use actual debug settings"
This reverts commit 3c5a0efb8d.
2013-09-28 05:15:45 +02:00
Inusaito Sayori
da38d4bc48 [VarRegions] Fix copy slurl on map to take the fmod of the x and y against the width of the region in question, instead of 256 2013-09-27 13:41:45 -04:00
Inusaito Sayori
fe29521298 [VarRegions] Made the radar aware that region width may not be 256 always anymore 2013-09-27 11:58:03 -04:00
Inusaito Sayori
4725db2d2f Merge branch 'VarRegion' of https://github.com/Lirusaito/SingularityViewer into aurora-sim
Merged cleanly:
	indra/llkeyframewalkmotion.cpp - 36e6946c96 - worked around a bug in Aurora walking motion
	indra/llrender/llimagegl.cpp - fa8e1f033b - An llerrs here becomes an llwarns, to avoid bothering the user with non power of two dimensioned images
	indra/newview/llmanip.cpp, indra/newview/llmanipscale.cpp - "Changed hardcoded 256 constants and such to width functions" - a50f0008b2
	indra/newview/llpatchvertexarray.cpp - fa8e1f033b - Support patches of non power of two width
	indra/newview/llworldmap.h - conflict

Conflicts:
	indra/llmessage/patch_code.cpp - My version cleaned up a bit of code duplication, so this was applied, within the new tags
	indra/llmessage/patch_code.h - b_large_patch in decode_patch_header defaults to false, indra/newview/llcloud.cpp patch removed.
	indra/llmessage/patch_dct.h - false positive
	indra/newview/llagent.cpp - false positive
	indra/newview/llfloaterregioninfo.cpp - nonsl wacky textures support meets the refactor.
	indra/newview/llfloaterworldmap.cpp - false positive
	indra/newview/llglsandbox.cpp - false positive
	indra/newview/llnetmap.cpp - small changes for type consistency brought into FS' patch, nothing important; also adds change to LLNetMap:draw removing getRegionWidthInMeters to keep using the constant REGION_WIDTH
	indra/newview/llpanelobject.cpp - Get the region width of the object we're editing for maximum pasted x/y coords
	indra/newview/llstartup.cpp - [Fixes old issues] My old patch did not fully use first_sim_size_x here, this has been fixed.  The unused first_sim_size_y has been removed.
	indra/newview/llsurface.cpp - rebuildWater isn't used, removed for now.  Styling conflicts otherwise.
	indra/newview/llsurfacepatch.cpp - remove FS patch that comments out code that isn't even in the modern source; cleaned up a mess of tags with more clear explanation, perhaps it can be expanded upon though.  Some styling conflicts.
	indra/newview/llviewermessage.cpp - Fix the problem? setRegionWidth by number.
	indra/newview/llviewerobject.cpp - false positive
	indra/newview/llviewerparcelmgr.cpp - just styling conflicts
	indra/newview/llviewerparcelmgr.h - false positive
	indra/newview/llviewerparceloverlay.cpp - false positive
	indra/newview/llviewerparceloverlay.h - false positive
	indra/newview/llviewerregion.cpp - cleaned up LLViewerRegion::getCompositionXY patches, they're more in the way than they're worth; removed DispatchOpenRegionSettings capability mention for now, it's not related to variable regions.  Also remove rebuildWater, it's not used right now.
	indra/newview/llvowater.cpp - false positive
	indra/newview/llwind.cpp - remove decode_patch_header patches for false, since we have a default; otherwise false positive.
	indra/newview/llworld.*
		- [Fixes old issues] Remove setRegionWidth by LLMessageSystem as the messages used are not always the same, the by number one remains of course.
		- Retained separation of connecting neighbors through the old method when the width is 256
		- updateLimits() would never have been merged in, we have an entirely different grid manager, therefore it's removed.
		- Fix the stupidity passed on over the years wherein a static constant variable would hold the same value as the first call to setLandFarClip..
	indra/newview/llworldmap.cpp - 36e6946c96 Aurora map workaround stuffs, parts removed; rework of LLWorldMap::simInfoFromHandle
	indra/newview/llworldmap.h - Cleaned up organization, avoid making members public, and fixed tagging
2013-09-27 09:51:39 -04:00
Latif Khalifa
d08c34cc2e Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-09-27 03:22:26 +02:00
Latif Khalifa
ad8ea07a7a Aurora var region support
Firestorm patch by Cinders
Adopted from Angstrom viewer with assistance of nhede Core
and Revolution Smythe.
2013-09-27 03:14:51 +02:00
Inusaito Sayori
2cc1658eda Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2013-09-26 04:39:55 -04:00
Inusaito Sayori
e58180a59e Revert "Revert OCD commit tick."
This reverts commit 7346931f7f.
2013-09-26 04:34:55 -04:00
Inusaito Sayori
0a67fa3520 Satisfy Issue 1115: Make clock on top status line toggleable
Click the clock to change from server time to local~
2013-09-26 04:34:17 -04:00
Latif Khalifa
6c1ea557b5 Harden agains network packet overruns
Patch by NickyD from Firestorm
2013-09-26 04:09:01 +02:00
Latif Khalifa
3066dcac58 Merge branch 'master' of https://github.com/slabua/SingularityViewer 2013-09-26 02:45:48 +02:00
Inusaito Sayori
34738593eb Allow species selection for plant creation
Fixes hardcoded "Random" string for translation of this new combobox.
2013-09-25 17:04:44 -04:00
Damian Zhaoying
0eba360416 update spanish language file floater_dae_export.xml 2013-09-25 13:30:03 -03:00
Damian Zhaoying
116a4048b7 Merge remote-tracking branch 'Liru/master' 2013-09-24 04:14:07 -03:00
Salvatore La Bua
2bc9b8a1b9 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-09-24 01:43:28 +02:00
Latif Khalifa
18859e44c7 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-09-24 01:39:58 +02:00
Shyotl
b473661cf4 ilu gcc (fix preprocessor macro typo that VS thought was dandy for some reason.) 2013-09-23 18:38:48 -05:00
Salvatore La Bua
dad4f4f9a0 Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-09-24 01:20:35 +02:00
Latif Khalifa
7263b87e62 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-09-24 00:57:47 +02:00
Shyotl
3fcc92ccad FOLDERID_LocalAppData should have been FOLDERID_RoamingAppData 2013-09-23 17:55:32 -05:00
Latif Khalifa
c06c909700 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-09-24 00:26:35 +02:00
Shyotl
c47f6405d2 Texfetch/cache changes:
Added SEND_UDP_REQ and	WAIT_UDP_REQ fetch states.
Parse 'content-range' from headers.
Purge 'complete' textures from the cache if they lack 'end of codestream' marker.
Added boostlevel/category to textureview display.
More diagnostic output.
Discard handling tweaks/bugfixes from v3.
2013-09-23 17:19:44 -05:00
Shyotl
55f43c5fcd Missed a SHGetSpecialFolderPath call. 2013-09-23 16:16:18 -05:00
Salvatore La Bua
3c5a0efb8d Trees shadow parameters use actual debug settings
Use RenderDeferredTreeShadowOffset, RenderDeferredTreeShadowBias,
RenderDeferredSpotShadowOffset and RenderDeferredSpotShadowBias
in place of hard coded values.
2013-09-23 22:34:41 +02:00
Inusaito Sayori
13077bc132 Fix group search's copy uri button copying the link for a personal group always.. Thanks to Malakina Gummibaum for pointing this out~ 2013-09-23 14:07:14 -04:00
Aleric Inglewood
f0c7dadfa6 Fix crash when previewing an animation.
When uploading an animation, playing the to-be-uploaded
animation on ones own avatar while ground sitting would
crash the viewer.

This fixes that, and makes the avatar cleanly stand up first.
Rationale: the alternative is to make the user learn by
means of crashing, being frozen or just not seeing the right
animation that they have to stand before uploading an animation.
There is no reason not to automate that.
2013-09-23 20:05:56 +02:00
Latif Khalifa
b6dfea6e5f Merge branch 'master' of git://github.com/LightDrake/SingularityViewer 2013-09-23 01:56:29 +02:00
Aleric Inglewood
5df5074090 Merge remote-tracking branch 'singu/master' 2013-09-23 01:43:52 +02:00
Aleric Inglewood
e3939c3632 Avoid long viewer freezes when region doesn't have reverse DNS.
Some opensim servers might not have a reverse DNS, which causes
a stall of up to 5 seconds for each call. This means that
every time you up the parcel music stream (or any other media)
the viewer would freeze six times 5 seconds.. 30 seconds.

With this patch it only freeze once ;) (when you enter a region).
It already did that before (too), but after that opening the
parcel media doesn't freeze the viewer at all anymore.
2013-09-23 01:41:11 +02:00
Aleric Inglewood
12d3873aa7 Crash fix for empty media URL.
Apparently LLViewerMediaImpl::navigateInternal could be called with
an empty url. That lead to a curl request with an empty url, which
failed because that leads to an empty 'service' string, which is
not allowed.

Patched the code to ignore empty media urls and hardened AICurl
to deal with any remaining cases.
2013-09-22 23:25:40 +02:00
Salvatore La Bua
083d569e35 Reverted Objects LOD slider max value to 2 and fixed presets values for the Trees LOD slider according to the new maximum 2013-09-22 22:33:09 +02:00