Melanie
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
Diva Canto
26e3a8ee4b
* Bug fix in HG: preserve the home region coordinates across multiple HG TPs.
...
* Removed unnecessary debug messages.
2009-12-19 10:16:07 -08:00
CasperW
6dbe25360e
Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.
2009-12-17 18:40:34 +01:00
Melanie
f8b6bc8d11
Merge branch 'master' into careminster
2009-12-15 15:46:18 +00:00
Diva Canto
9e54e61a43
Make the HG map search recognize host names without ports.
2009-12-14 08:27:16 -08:00
Melanie
1382dc976c
Merge branch 'master' into careminster
2009-12-12 04:14:47 +00:00
Diva Canto
decd51f081
Attempt at fixing mantis #4411 .
2009-12-11 08:11:26 -08:00
Melanie
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
CasperW
2a6dbd068e
Last bits and bobs to clean up the Meta7WindlightModule
2009-12-09 03:58:56 +01:00
Melanie
dd5696e8bd
Same for the remote auth connector
2009-12-07 14:31:55 +00:00
Melanie
c2d3afdeee
Same for the remote auth connector
2009-12-07 14:31:20 +00:00
Melanie
9155c9ee37
Merge branch 'master' into careminster
2009-12-07 14:14:00 +00:00
Kunnis
4c61fcfc40
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
...
Signed-off-by: Melanie <melanie@t-data.com >
2009-12-06 03:57:15 +00:00
Melanie
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
KittoFlora
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
Justin Clark-Casey (justincc)
c0f3a4c833
Allow terrain heightmaps to be loaded directly from URIs via the remote admin plugin
...
See http://opensimulator.org/mantis/view.php?id=4418
Thanks StrawberryFride
See
2009-12-04 18:26:58 +00:00
Adam Frisby
30fe88b808
* Terrain uploads via the Estate Tools now support a multitude of file formats. Specifically: . bmp, .raw, .r32 & .r64. (in ascending order of precision)
...
* It uses file length as the detection routine (as each of these formats has a distinct size in bytes for a 256x256 array.) - more formats should be possible to add.
2009-12-03 02:44:12 +11:00
Melanie
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00:00
Justin Clark-Casey (justincc)
e078fb2e71
Implement god mode user freezing and unfreezing
...
See http://opensimulator.org/mantis/view.php?id=4356
Thanks Revolution
I performed a subsequent probable bug fix in this patch
2009-11-27 19:23:51 +00:00
Justin Clark-Casey (justincc)
2e47e51475
Make locking of timers and listeners in script related functions consistent
...
See http://opensimulator.org/mantis/view.php?id=4316
Thanks KittyLiu!
2009-11-27 19:01:45 +00:00
Justin Clark-Casey (justincc)
25e2b16451
Apply patch to stop failure of llParcelMediaCommandList() on group deeded land
...
See http://opensimulator.org/mantis/view.php?id=3999
2009-11-27 17:52:23 +00:00
Justin Clark-Casey (justincc)
32ef1b9e23
remove stringent content type checking to make it easier to load oars directly from urls
2009-11-27 15:10:12 +00:00
Melanie
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +00:00
Melanie
41226dc991
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-26 17:05:48 +00:00
Melanie
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
Justin Clark-Casey (justincc)
2bc19a1e23
Resolve issue where an iar load fails to preserve original item creators
...
See http://opensimulator.org/mantis/view.php?id=4394
This change preserves the uuid when a profile is found rather than the ospa
2009-11-26 16:39:30 +00:00
Melanie
79395bc7db
Merge branch 'master' into careminster
2009-11-25 17:04:05 +00:00
Justin Clark-Casey (justincc)
59caa68e08
minor: add doc to a few parcel methods
2009-11-25 17:49:38 +00:00
Justin Clark-Casey (justincc)
40464f6cc6
Change chat config code so that enabled = false actually does disable the chat module
2009-11-25 16:23:37 +00:00
Justin Clark-Casey (justincc)
a4d2a97bc6
minor: remove some mono compiler warnings, add --merge load oar switch to help information
2009-11-25 16:14:08 +00:00
Justin Clark-Casey (justincc)
c18422ad3a
Implement oar merging
...
An oar can now be merged with existing region contents by using the --merge option
For example, load oar --merge my.oar
Existing terrain, region settings and parcel data is left in place when an oar is merged.
See http://opensimulator.org/wiki/OpenSim_Archives#Usage for more information
2009-11-25 16:02:47 +00:00
Justin Clark-Casey (justincc)
f9807884a4
Add MIT/X11 licensed NDesk.Options ( http://www.ndesk.org/Options ) DLL to aid command line parsing
2009-11-25 15:28:43 +00:00
Melanie
25b4160434
Merge branch 'master' into careminster
2009-11-25 08:45:41 +00:00
CasperW
d5aceb6d95
Append a prefix to the god avatar names appearing in chat whilst in god mode (disabled by default, config entry admin_prefix)
2009-11-24 23:33:12 +01:00
Justin Clark-Casey (justincc)
f605d59136
Make load/save iar slightly better in the face of io failures by always attempting to close the streams
2009-11-24 18:27:31 +00:00
Justin Clark-Casey (justincc)
c083ab6824
make save and load oar slightly more robust by always closing the archive streams even if there has been an error
2009-11-24 17:47:09 +00:00
Justin Clark-Casey (justincc)
88ead9ee63
pass all command parameters to load/save oar, not just the filename
...
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
2009-11-24 17:28:38 +00:00
CasperW
8383bde768
Removed some extra debug chatter
2009-11-24 18:18:19 +01:00
CasperW
d114713694
Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lock handler. This gives us:
...
- Faster prim inventory actions. Multiple threads can read at once.
- Fixes the known prim inventory thread locks
- In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
2009-11-24 18:02:12 +01:00
Justin Clark-Casey (justincc)
52952a75ca
minor: remove experimental tags from load iar and save iar commands
2009-11-24 15:20:02 +00:00
CasperW
73c2162ff6
Fixed nullrefs
2009-11-23 19:51:40 +01:00
Melanie
df121a7cd0
Merge branch 'master' into careminster
2009-11-23 04:24:58 +00:00
Jeff Ames
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
Melanie
5d0778014d
Merge branch 'master' into careminster
2009-11-18 06:20:21 +00:00
Justin Clark-Casey (justincc)
2606bf4a53
minor: very minor formatting change
2009-11-16 19:16:24 +00:00
Melanie
b7f1fc116e
Prevent a nullref if a recipient of a group message gas left the scene
2009-11-15 20:21:46 +00:00
Justin Clark-Casey (justincc)
96be5e5a88
minor: A further minor tweak to reduce iar load logging verbosity
2009-11-13 20:24:45 +00:00
Justin Clark-Casey (justincc)
ed1089d892
refactor some test asset creation into a helper class
...
remove mono compiler warning
2009-11-12 19:08:00 +00:00
Justin Clark-Casey (justincc)
d21fc1cefb
minor: for now stop iar tests spewing log messages when running testsuite
2009-11-12 18:33:40 +00:00
Adam Frisby
cedd827f7f
* Added some new syntax options for the Monitor Module's HTTP poll.
2009-11-12 11:17:04 +11:00
