Files
SingularityViewer/indra/newview
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
..
2013-03-26 00:46:11 -05:00
2012-10-04 18:13:48 -04:00
2013-03-11 03:44:32 -04:00
2013-05-28 03:59:35 +02:00
2013-09-26 04:34:55 -04:00
2013-05-11 22:36:46 -04:00
2013-05-11 22:36:46 -04:00
2012-02-19 11:30:27 -05:00
2012-08-11 02:51:49 -04:00
2013-07-06 00:06:51 +02:00
2013-08-31 22:56:37 +02:00
2011-11-06 16:35:49 +01:00
2013-01-09 00:07:17 +01:00
2012-10-31 05:01:24 +01:00
2013-03-26 00:46:11 -05:00
2013-06-21 03:23:52 -04:00
2012-03-21 02:22:27 -05:00
2013-07-31 15:49:34 -04:00
2012-10-31 05:01:24 +01:00
2012-10-31 05:01:24 +01:00
2013-09-27 03:14:51 +02:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-09-23 17:19:44 -05:00
2013-04-16 00:25:59 -05:00
2013-06-25 16:21:51 -05:00
2013-04-16 00:25:59 -05:00
2013-06-26 03:51:27 -04:00
2013-06-26 03:51:27 -04:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-06-26 03:51:27 -04:00
2013-07-16 16:46:36 +02:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-05-28 03:24:12 +02:00
2012-10-31 05:01:24 +01:00
2013-06-26 03:51:27 -04:00
2013-06-26 03:51:27 -04:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-01-06 23:40:53 +01:00
2013-07-16 16:46:36 +02:00
2012-04-13 22:39:39 -05:00
2013-05-29 23:56:33 -04:00
2013-04-16 00:25:59 -05:00
2013-09-27 03:14:51 +02:00
2013-06-11 07:36:49 -04:00
2013-04-16 00:25:59 -05:00
2011-10-13 00:03:56 -05:00
2012-01-23 18:30:54 -06:00
2012-01-23 18:30:54 -06:00
2013-03-26 00:46:11 -05:00
2012-11-16 02:47:05 -05:00
2012-11-16 02:47:05 -05:00
2012-11-16 02:47:05 -05:00
2012-07-06 11:37:45 +00:00
2012-07-06 11:37:45 +00:00
2013-06-03 22:20:27 -04:00
2013-06-03 22:20:27 -04:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-05-11 22:36:46 -04:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-05-11 22:36:46 -04:00
2013-05-11 22:36:46 -04:00
2013-06-03 22:20:27 -04:00
2013-05-29 23:56:33 -04:00
2011-10-13 00:03:56 -05:00
2013-07-31 17:05:58 -04:00
2012-04-13 22:39:39 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-05-11 22:36:46 -04:00
2013-09-27 03:14:51 +02:00
2013-09-23 17:19:44 -05:00
2013-09-23 17:19:44 -05:00
2012-10-31 05:01:24 +01:00
2013-09-23 17:19:44 -05:00
2013-01-06 09:47:02 -05:00
2012-01-25 21:11:33 +01:00
2012-04-13 22:39:39 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-04-16 00:25:59 -05:00
2013-01-05 22:14:10 +01:00
2012-04-13 22:39:39 -05:00
2013-05-11 22:36:46 -04:00
2013-05-11 22:36:46 -04:00
2012-10-31 05:01:24 +01:00
2012-08-03 11:32:36 -04:00
2012-08-03 11:32:36 -04:00
2012-12-12 16:27:32 +01:00
2012-12-12 16:27:32 +01:00
2011-10-13 00:03:56 -05:00
2013-03-26 00:46:11 -05:00
2012-06-27 04:27:07 +02:00
2013-05-29 23:56:33 -04:00
2013-04-24 14:09:04 -04:00
2013-06-11 07:36:49 -04:00
2013-09-27 03:14:51 +02:00
2013-09-27 03:14:51 +02:00
2012-07-06 11:37:45 +00:00
2013-09-23 17:19:44 -05:00
2013-09-27 03:14:51 +02:00
2013-09-27 03:14:51 +02:00
2013-09-27 03:14:51 +02:00
2013-07-19 21:22:59 +02:00
2011-09-20 22:16:00 -05:00
2013-06-03 22:20:27 -04:00
2012-03-21 02:22:27 -05:00
2013-09-27 03:14:51 +02:00
2013-02-25 12:53:18 -06:00
2012-03-04 09:39:28 +01:00
2013-01-14 22:59:49 +01:00
2012-03-25 09:31:03 +02:00
2012-02-05 15:43:57 +01:00
2013-06-01 02:49:21 -04:00
2013-06-01 02:49:21 -04:00
2013-05-29 23:56:33 -04:00
2013-06-01 02:49:21 -04:00
2013-03-26 00:46:11 -05:00
2013-06-01 02:49:21 -04:00
2013-06-01 02:49:21 -04:00
2013-03-26 00:46:11 -05:00
2013-05-29 23:56:33 -04:00
2012-02-19 11:30:27 -05:00
2012-02-19 11:30:27 -05:00
2012-08-04 13:43:32 -05:00