Commit Graph

14124 Commits (88da253c947c78e97f78119203e3c2f216a788e2)

Author SHA1 Message Date
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
Melanie 2d2098f5da Export the module interface for restart 2010-11-25 04:06:25 +00:00
opensim mirror account d00405d3b8 Merge branch 'master' of /var/git/opensim/ 2010-11-24 19:30:05 -08:00
Melanie 57c4def254 Change all restarting to use the restart module. Remove hardcoded behavior 2010-11-25 03:16:52 +00:00
opensim mirror account 8fadfc4734 Merge branch 'master' of /var/git/opensim/ 2010-11-24 18:30:32 -08:00
Melanie fb97fe8307 Finish the RestartModule and fix some bugs. Add new console commands:
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
Melanie 6734c9f83a Implement the restart module 2010-11-25 01:22:05 +00:00
Melanie e14f449cc2 Adding the skeleton for the restart module 2010-11-24 22:14:53 +00:00
opensim mirror account 181daf3a9d Merge branch 'master' of /var/git/opensim/ 2010-11-24 02:10:12 -08:00
dahlia 9f29908f66 catch an exception when a mesh asset header cant be decoded 2010-11-24 02:05:41 -08:00
Jonathan Freedman bc51dfc45e Merge branch 'master-core' into mantis5110 2010-11-23 22:27:54 -08:00
opensim mirror account a1daeb277e Merge branch 'master' of /var/git/opensim/ 2010-11-23 07:50:04 -08:00
Diva Canto a4bf6c5343 Attempt at fixing failing test. 2010-11-23 07:44:42 -08:00
opensim mirror account cb2b1257e9 Merge branch 'master' of /var/git/opensim/ 2010-11-23 07:20:16 -08:00
opensim mirror account 32cbf0c542 Merge branch 'master' of /var/git/opensim/ 2010-11-23 06:40:21 -08:00
Diva Canto 61a49ec4a8 Initialize InventoryItemBase.creatorData properly. Could throw. 2010-11-23 06:36:57 -08:00
Melanie 2527aeb40c Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-11-23 14:03:52 +00:00
Melanie 45b08a9ce3 Fix more potential nullrefs 2010-11-23 14:02:20 +00:00
Melanie 7796b90ebb Fix some crashes caused by the addition of the CreatorData column 2010-11-23 14:02:06 +00:00
opensim mirror account 87e565d28d Merge branch 'master' of /var/git/opensim/ 2010-11-23 03:00:09 -08:00
Marck c68f03a6ff Fix: Allow use of parameters without specifying a file path with command "save oar" 2010-11-23 11:45:12 +01:00