180 Commits

Author	SHA1	Message	Date
Melanie	26f12f479f	Merge branch 'master' into careminster-presence-refactor	2010-11-02 22:58:33 +00:00
Justin Clark-Casey (justincc)	ade71c9ed7	Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info	2010-10-30 01:32:56 +01:00
Melanie	dbd1a68b58	Fix a LSL issue and a prim naming issue	2010-10-29 20:35:06 +02:00
Melanie	3231602b88	Revert "Preliminary work on appearance layers. No user functionality yet." ... This reverts commit e6a8d2872c.	2010-10-29 20:34:53 +02:00
Melanie	e6a8d2872c	Preliminary work on appearance layers. No user functionality yet.	2010-10-29 18:59:53 +02:00
Melanie	7f74dc1b14	Merge branch 'master' into careminster-presence-refactor	2010-10-23 00:21:42 +01:00
Justin Clark-Casey (justincc)	fe8d3d5a2b	Revert "Merge remote branch 'otakup0pe/mantis5110'" ... This reverts commit 21187f459e, reversing changes made to 8f34e46d74.	2010-10-22 23:52:07 +01:00
Jonathan Freedman	d4144bedb8	* change the data exchanged within hypergrid transactions	2010-10-21 23:22:15 -04:00
Melanie	fc33d569cd	Merge branch 'master' into careminster-presence-refactor	2010-10-21 07:33:01 +01:00
Jonathan Freedman	58f75fa19d	* more url / hg cleanup	2010-10-20 22:21:45 -04:00
Jonathan Freedman	55974df14b	* refactor refactor refactor ServerURI 4 lyfe	2010-10-20 22:21:23 -04:00
Jonathan Freedman	a2167b0f0d	* more url / hg cleanup	2010-10-11 16:53:00 -04:00
Jonathan Freedman	2654ab6300	Merge branch 'master' of git://opensimulator.org/git/opensim	2010-10-10 18:06:27 -04:00
Melanie	4a57288577	Fix an infinite recursion	2010-10-08 23:23:07 +01:00
Melanie	52dd547863	Make SendKillObject send multiple localIDs in one packet. This avoids the ... halting visual behavior of large group deletes and eliminates the packet flood	2010-10-08 11:31:52 +02:00
Jonathan Freedman	4adada6fe4	Merge branch 'master' of git://opensimulator.org/git/opensim	2010-10-07 23:47:39 -04:00
Melanie	ba0afa53d3	Implement rezzing coalesced objects	2010-10-07 05:12:39 +02:00
Melanie	2db0ac74c7	Implement taking of coalesced objects. ... WARNING!!!!! You can TAKE them, but you can't REZ them again. Only the first of the contained objects will rez, the rest is inaccessible until rezzing them is implemented. Also, rotations are not explicitly stored. This MAY work. Or not.	2010-10-07 01:13:17 +02:00
Melanie	abfede7819	Plumb the path for multiple object deletes	2010-10-06 20:00:51 +01:00
Melanie	42f76773a1	Plumb the path for multiple object deletes	2010-10-06 19:59:30 +02:00
Jonathan Freedman	8f1acb890a	Merge branch 'master' of git://opensimulator.org/git/opensim	2010-10-05 14:17:18 -04:00
Melanie	da6816c805	Merge branch 'master' into careminster-presence-refactor	2010-10-04 04:49:54 +01:00
Diva Canto	0772e19af2	Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.	2010-10-03 20:01:59 -07:00
Jonathan Freedman	32ccc7a9d9	* refactor refactor refactor ServerURI 4 lyfe	2010-10-02 19:17:02 -04:00
Melanie	7df4383235	Merge branch 'master' into careminster-presence-refactor ... Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.	2010-09-17 03:49:30 +01:00
John Hurliman	860b2a502f	Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection	2010-09-16 17:30:46 -07:00
Melanie	6a1ce17cdb	Merge branch 'master' into careminster-presence-refactor ... The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.	2010-09-13 16:17:38 +01:00
Jeff Ames	f1f0bc23f4	Formatting cleanup.	2010-09-12 13:43:49 -04:00
Melanie	e4c2b44e5c	Merge branch 'master' into careminster-presence-refactor	2010-09-05 15:06:00 +01:00
Justin Clark-Casey (justincc)	1e8e98a07f	Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs ... This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.	2010-09-04 01:36:26 +01:00
Justin Clark-Casey (justincc)	8d2e8b7d5c	minor: remove mono compiler warnings	2010-09-03 21:28:57 +01:00
Melanie Thielker	c47de94263	Adjust the "Magic numbers" we use because we can't reference the actual ... script state enum to reflect recent changes.	2010-08-31 22:36:46 +01:00
Melanie Thielker	aca10cb027	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor	2010-08-31 22:26:17 +02:00
Melanie Thielker	b973fe5297	Adjust the "Magic numbers" we use because we can't reference the actual ... script state enum to reflect recent changes.	2010-08-31 22:24:11 +02:00
meta7	35d6181b78	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor	2010-08-30 11:42:17 -07:00
meta7	4cf5ef3cd4	Kick the user from the region in the circumstance that the TP home failed - ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable.	2010-08-30 11:41:20 -07:00
Melanie	79bfa275da	Merge branch 'master' into careminster-presence-refactor	2010-08-30 02:30:28 +01:00
Jonathan Freedman	0a83fde85c	Implements parcel media setting persistence and packet / CAPS handling ... properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com>	2010-08-30 02:07:55 +01:00
Diva Canto	0f95cd209e	Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning	2010-08-27 17:25:04 -07:00
Justin Clark-Casey (justincc)	8031f8ec09	Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking	2010-08-26 00:08:53 +01:00
Melanie	fc8d2be632	Merge branch 'master' into careminster-presence-refactor ... This was rather conflicted. Please test linking.	2010-08-26 00:11:07 +01:00
Melanie Thielker	5a05de0eec	Call attachment cleanup when an agent crosses out	2010-08-24 18:38:54 +02:00
Melanie	e74809ff4c	Merge branch 'master' into careminster-presence-refactor	2010-08-18 00:59:20 +01:00
John Hurliman	a8c0b131f9	* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() to fix the build	2010-08-17 13:50:04 -07:00
Diva Canto	69ad04cdf6	Attempt at sending TeleportProgress, but it doesn't seem to be doing anything at all. Left it commented, just as a reminder for where those messages could be sent.	2010-08-16 12:03:13 -07:00
Diva Canto	77de28965a	Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).	2010-08-16 11:33:59 -07:00
Diva Canto	a5044e08fb	Better comment (related to previous commit)	2010-08-15 18:13:09 -07:00
Diva Canto	5d29c0ec9d	Addresses mantis #4929. Agent was being logged off the grid too soon -- things may still fail.	2010-08-15 18:10:54 -07:00
Justin Clark-Casey (justincc)	1463691cb6	In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from libomv rather than little endian then swapping ... This avoids a problem with failing to swap on big-endian machines. This addresses http://opensimulator.org/mantis/view.php?id=4849 Thanks to Valy- for pointing this out and submitting a suggestion patch	2010-08-14 00:48:12 +01:00
Justin Clark-Casey (justincc)	8acb401a14	minor: remove mono compiler warnings	2010-08-13 23:28:28 +01:00