Commit Graph

13877 Commits (2ce7d982fa184dbc4bec9b132cd087e1efbf33ae)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 2486d96d06 minor: correction to logging category 2010-12-04 00:56:53 +00:00
opensim mirror account 6770e43ef0 Merge branch 'master' of /var/git/opensim/ 2010-12-03 16:50:02 -08:00
opensim mirror account cc573e97d5 Merge branch 'master' of /var/git/opensim/ 2010-12-03 16:00:27 -08:00
Justin Clark-Casey (justincc) b69c5d6633 minor: change OpenSimBase log messages associated with newer module loader to make the association clear 2010-12-03 23:50:09 +00:00
Mic Bowman df860516bf Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
opensim mirror account ffaaa5c750 Merge branch 'master' of /var/git/opensim/ 2010-12-02 16:20:08 -08:00
Justin Clark-Casey (justincc) 7e72afcb3e Only force prim persistence before delete if the prim is the result of an unpersisted delink
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
opensim mirror account 3da12c2d3f Merge branch 'master' of /var/git/opensim/ 2010-12-01 18:10:02 -08:00
Justin Clark-Casey (justincc) 5246d98b8d Stop LLUDPServer sending updates after object deletes by always queueing deletes
If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog
This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately.
Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates.
In tests, this doesn't appear to affect performance.
There is probably still an issue present where an update packet might not be acked and then resent after the kill packet.
2010-12-02 02:01:01 +00:00
Justin Clark-Casey (justincc) 26569a7cd0 minor: add some method doc 2010-12-02 02:01:01 +00:00
opensim mirror account d60ace97bf Merge branch 'master' of /var/git/opensim/ 2010-12-01 16:20:03 -08:00
Diva Canto f1a7847532 Deleted obsolete config files from old OpenSim.Grid. 2010-12-01 16:19:27 -08:00
opensim mirror account 6f3fbca5a3 Merge branch 'master' of /var/git/opensim/ 2010-12-01 16:10:15 -08:00
Diva Canto 7d24dbca3c Added some comments. Better than listening to the boring speaker... 2010-12-01 16:01:22 -08:00
Dan Lake 681190f682 Merge branch 'master' into danmerge
Conflicts:
	.nant/local.include
	OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	bin/config-include/SimianGrid.ini
	prebuild.xml
2010-11-30 17:36:36 -08:00
opensim mirror account 4b4337d024 Merge branch 'master' of /var/git/opensim/ 2010-11-29 10:10:08 -08:00
Diva Canto f3835fe15c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-29 09:58:20 -08:00
Diva Canto 49b59fffee Fix unit test. 2010-11-29 09:57:41 -08:00
Diva Canto f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00
opensim mirror account 51a2cab05b Merge branch 'master' of /var/git/opensim/ 2010-11-28 18:20:02 -08:00
Melanie 04ce7de5ed Fix the build break 2010-11-29 01:15:30 +00:00
opensim mirror account d85a53f040 Merge branch 'master' of /var/git/opensim/ 2010-11-28 16:40:08 -08:00
Melanie 5aeb83125a Remove the most spammy XML dumps from the FS voice module 2010-11-28 23:30:55 +00:00
Diva Canto ca8d015733 Changed the parser for InventoryItem deserialization. Moved some utility functions around. 2010-11-27 11:40:54 -08:00
opensim mirror account be216e1e39 Merge branch 'master' of /var/git/opensim/ 2010-11-27 02:10:05 -08:00
Marck d71d4f96e3 Amend GetLinkPrimitiveParams with implementations for PRIM_TEXGEN, PRIM_BUMP_SHINY, PRIM_FULLBRIGHT, and PRIM_GLOW 2010-11-27 10:59:14 +01:00
opensim mirror account 35a1c749f3 Merge branch 'master' of /var/git/opensim/ 2010-11-27 00:20:07 -08:00
Marck 947d730b56 Make gatekeeper's address check case-insensitive. 2010-11-27 09:18:39 +01:00
Diva Canto 3292a22558 Creator information preserved upon HG transfers. 2010-11-26 22:06:34 -08:00
opensim mirror account 35f74ac4ee Merge branch 'master' of /var/git/opensim/ 2010-11-26 18:30:05 -08:00
opensim mirror account 2f3fcd4b72 Merge branch 'master' of /var/git/opensim/ 2010-11-26 18:10:02 -08:00
Micheil Merlin 6ed63487d9 llUnsit position fix 4063 (updated 11-20-2010) 2010-11-27 02:05:44 +00:00
opensim mirror account 3bfdc7c8de Merge branch 'master' of /var/git/opensim/ 2010-11-26 17:40:03 -08:00
opensim mirror account 0f52f90f9c Merge branch 'master' of /var/git/opensim/ 2010-11-26 17:30:05 -08:00
Micheil Merlin a8a8fb6e13 llVecNorm nant test 2010-11-27 01:29:55 +00:00
Melanie 63e2c3b2d6 Reformat an overzealous comment. Remove end of line marks and reference to the
Mantis solved, as that isn't needed to understand the code. Reformat the
comment for 80 col screens.
2010-11-27 01:28:02 +00:00
Justin Clark-Casey (justincc) e0866faacc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-27 01:27:46 +00:00
Mic Bowman 541a7660e0 Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
opensim mirror account b844fef58a Merge branch 'master' of /var/git/opensim/ 2010-11-26 17:00:05 -08:00
Justin Clark-Casey (justincc) 0e311a2104 If we fail to gather asset uuids for a particular asset, log the failing asset id and type 2010-11-27 00:54:09 +00:00
opensim mirror account f10aa2c887 Merge branch 'master' of /var/git/opensim/ 2010-11-26 14:10:05 -08:00
Marck 7c02d5cec5 Another attempt at fixing failing test for creator info. 2010-11-26 23:04:31 +01:00
opensim mirror account e30f61445f Merge branch 'master' of /var/git/opensim/ 2010-11-26 13:50:08 -08:00
Marck 2827deffe8 Trigger changed event with CHANGED_TELEPORT when teleporting to another region. 2010-11-26 22:46:48 +01:00
opensim mirror account 6915edbf94 Merge branch 'master' of /var/git/opensim/ 2010-11-26 03:30:10 -08:00
Marck 0bc5ffbe96 Fix handling of landmarks for systems with culture settings other than en_US. This fixes Mantis #5177. 2010-11-26 11:50:51 +01:00
Diva Canto 1cbd2842d5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-25 16:27:19 -08:00
Diva Canto ae4b02e115 WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. 2010-11-25 11:14:16 -08:00
opensim mirror account 06d8f67448 Merge branch 'master' of /var/git/opensim/ 2010-11-24 21:10:03 -08:00
opensim mirror account e9d59389e8 Merge branch 'master' of /var/git/opensim/ 2010-11-24 20:20:03 -08:00