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 |
Robert Adams
|
9e68de6b8f
|
PE physics plugin stubs
|
2010-11-23 13:32:46 -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 |
Marck
|
ba2bf78dcf
|
Fix joining land parcels not being stored correctly in SQLite. Thank you to goetz for the initial patch in Mantis #5230.
|
2010-11-23 11:45:12 +01:00 |
opensim mirror account
|
64918589ec
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 20:30:06 -08:00 |
Justin Clark-Casey (justincc)
|
8d79a39d5b
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2010-11-23 04:27:06 +00:00 |
Justin Clark-Casey (justincc)
|
63170fdea7
|
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
|
2010-11-23 04:26:07 +00:00 |
Justin Clark-Casey (justincc)
|
bbc291dfdf
|
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
|
2010-11-22 23:07:30 +00:00 |
Justin Clark-Casey (justincc)
|
34b13a4765
|
add basic tests to check that under default permissions module owner can delete objects and that non-owners (who are also not administrators, etc.) cannot
|
2010-11-22 22:54:13 +00:00 |
opensim mirror account
|
9362d11077
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 10:40:03 -08:00 |
Marck
|
e1c72cedb3
|
Let CHANGED_SCALE also trigger when editing prims and linksets with the viewer's edit tools.
This event used to trigger only when the scale was changed with a script.
|
2010-11-22 19:38:44 +01:00 |
Marck
|
d63965cf94
|
Let CHANGED_SHAPE trigger. This fixes Mantis #1844.
|
2010-11-22 19:38:44 +01:00 |
opensim mirror account
|
7e862dfe5e
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 07:30:05 -08:00 |
opensim mirror account
|
f9f386f73b
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 07:20:08 -08:00 |
Melanie
|
d2aebbe066
|
Fox case on a method
|
2010-11-22 14:27:45 +00:00 |
Melanie
|
4e0a289a8d
|
Change FS Voice module to a shared module to avoid gratuitious server handler
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
|
2010-11-22 14:13:27 +00:00 |
opensim mirror account
|
d272a5bd25
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-22 02:20:10 -08:00 |
Marck
|
8a2c365e5b
|
Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
Fixes Mantix #5214.
|
2010-11-22 10:39:46 +01:00 |
Jonathan Freedman
|
b7f5e82843
|
Merge branch 'master-core' into mantis5110
|
2010-11-21 20:01:48 -08:00 |
Jonathan Freedman
|
562147475c
|
Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
|
2010-11-21 19:51:23 -08:00 |
opensim mirror account
|
f01e1094a3
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 17:50:03 -08:00 |
opensim mirror account
|
c913f92f0f
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 17:30:05 -08:00 |
Diva Canto
|
0fec29c849
|
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
|
2010-11-21 17:19:45 -08:00 |
Diva Canto
|
c617d658dd
|
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
New migration in inventory table in order to make CreatorID varchar(255).
|
2010-11-21 17:19:24 -08:00 |
opensim mirror account
|
a1549a1d85
|
Merge branch 'master' of /var/git/opensim/
|
2010-11-21 16:50:03 -08:00 |
Melanie
|
8466ada8e0
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-11-22 00:46:37 +00:00 |
Melanie
|
ddf08276f1
|
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
|
2010-11-22 00:46:23 +00:00 |