Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-12 | 1 | -1/+1 |
|\ | |||||
| * | Attempt at fixing mantis #4411. | Diva Canto | 2009-12-11 | 1 | -1/+1 |
| | | |||||
| * | Same for the remote auth connector | Melanie | 2009-12-07 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵ | Melanie | 2009-12-10 | 1 | -5/+4 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Secnond revision of Sit and Stand for unscripted prims; Comment out | KittoFlora | 2009-12-05 | 1 | -5/+4 |
| | | | | | | | | | | | | spammy debug messages in Interregion.... | ||||
* | | | Last bits and bobs to clean up the Meta7WindlightModule | CasperW | 2009-12-09 | 1 | -0/+245 |
| | | | |||||
* | | | Same for the remote auth connector | Melanie | 2009-12-07 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-12-07 | 1 | -1/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's ↵ | Kunnis | 2009-12-06 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | not even stored in mysql. Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-12-05 | 2 | -20/+62 |
|\ \ \ | |/ / | |||||
| * | | Allow terrain heightmaps to be loaded directly from URIs via the remote ↵ | Justin Clark-Casey (justincc) | 2009-12-04 | 1 | -1/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | admin plugin See http://opensimulator.org/mantis/view.php?id=4418 Thanks StrawberryFride See | ||||
| * | | * Terrain uploads via the Estate Tools now support a multitude of file ↵ | Adam Frisby | 2009-12-03 | 1 | -19/+31 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2009-11-28 | 4 | -40/+64 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Implement god mode user freezing and unfreezing | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -27/+44 |
| | | | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=4356 Thanks Revolution I performed a subsequent probable bug fix in this patch | ||||
| * | Make locking of timers and listeners in script related functions consistent | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -3/+6 |
| | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=4316 Thanks KittyLiu! | ||||
| * | Apply patch to stop failure of llParcelMediaCommandList() on group deeded land | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -8/+9 |
| | | | | | | | | See http://opensimulator.org/mantis/view.php?id=3999 | ||||
| * | remove stringent content type checking to make it easier to load oars ↵ | Justin Clark-Casey (justincc) | 2009-11-27 | 1 | -2/+5 |
| | | | | | | | | directly from urls | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-26 | 5 | -11/+23 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-11-26 | 3 | -2/+17 |
| |\ | |||||
| | * | Resolve issue where an iar load fails to preserve original item creators | Justin Clark-Casey (justincc) | 2009-11-26 | 3 | -2/+17 |
| | | | | | | | | | | | | | | | See http://opensimulator.org/mantis/view.php?id=4394 This change preserves the uuid when a profile is found rather than the ospa | ||||
| * | | Remove the old (Remoting) region crossing code. Fix the new code to | Melanie | 2009-11-26 | 2 | -9/+6 |
| |/ | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-25 | 5 | -8/+41 |
|\ \ | |/ | |||||
| * | minor: add doc to a few parcel methods | Justin Clark-Casey (justincc) | 2009-11-25 | 3 | -2/+23 |
| | | |||||
| * | Change chat config code so that enabled = false actually does disable the ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -2/+3 |
| | | | | | | | | chat module | ||||
| * | minor: remove some mono compiler warnings, add --merge load oar switch to ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -1/+0 |
| | | | | | | | | help information | ||||
| * | Implement oar merging | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -6/+10 |
| | | | | | | | | | | | | | | 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 | ||||
| * | Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid ↵ | Justin Clark-Casey (justincc) | 2009-11-25 | 1 | -1/+9 |
| | | | | | | | | command line parsing | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-25 | 7 | -78/+146 |
|\ \ | |/ | |||||
| * | Make load/save iar slightly better in the face of io failures by always ↵ | Justin Clark-Casey (justincc) | 2009-11-24 | 2 | -63/+77 |
| | | | | | | | | attempting to close the streams | ||||
| * | make save and load oar slightly more robust by always closing the archive ↵ | Justin Clark-Casey (justincc) | 2009-11-24 | 3 | -13/+30 |
| | | | | | | | | streams even if there has been an error | ||||
| * | pass all command parameters to load/save oar, not just the filename | Justin Clark-Casey (justincc) | 2009-11-24 | 1 | -0/+37 |
| | | | | | | | | unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure | ||||
| * | minor: remove experimental tags from load iar and save iar commands | Justin Clark-Casey (justincc) | 2009-11-24 | 1 | -2/+2 |
| | | |||||
* | | Append a prefix to the god avatar names appearing in chat whilst in god mode ↵ | CasperW | 2009-11-24 | 1 | -3/+8 |
| | | | | | | | | (disabled by default, config entry admin_prefix) | ||||
* | | Removed some extra debug chatter | CasperW | 2009-11-24 | 1 | -1/+1 |
| | | |||||
* | | Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim ↵ | CasperW | 2009-11-24 | 1 | -11/+10 |
| | | | | | | | | | | | | | | | | 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 | ||||
* | | Fixed nullrefs | CasperW | 2009-11-23 | 1 | -19/+23 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-23 | 23 | -44/+476 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2009-11-23 | 23 | -44/+476 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-11-18 | 1 | -4/+1 |
|\ \ | |/ | |||||
| * | minor: very minor formatting change | Justin Clark-Casey (justincc) | 2009-11-16 | 1 | -4/+1 |
| | | |||||
* | | Prevent a nullref if a recipient of a group message gas left the scene | Melanie | 2009-11-15 | 1 | -12/+15 |
|/ | |||||
* | minor: A further minor tweak to reduce iar load logging verbosity | Justin Clark-Casey (justincc) | 2009-11-13 | 1 | -2/+2 |
| | |||||
* | refactor some test asset creation into a helper class | Justin Clark-Casey (justincc) | 2009-11-12 | 1 | -8/+2 |
| | | | | remove mono compiler warning | ||||
* | minor: for now stop iar tests spewing log messages when running testsuite | Justin Clark-Casey (justincc) | 2009-11-12 | 1 | -1/+1 |
| | |||||
* | * Added some new syntax options for the Monitor Module's HTTP poll. | Adam Frisby | 2009-11-12 | 1 | -0/+30 |
| | |||||
* | * Move RegionCombinerModule to it's own project | Teravus Ovares (Dan Olivares) | 2009-11-10 | 9 | -1768/+0 |
| | | | | * Moves the mono_metadata_token_from_dor message to a different module on loading. | ||||
* | Broke the monster RegionLoaded method in RegionCombinerModule into 4 smaller ↵ | Diva Canto | 2009-11-10 | 1 | -224/+248 |
| | | | | methods. Let's see if this avoids a mono bug that is making megaregions not work in mono. Long shot, but worth a try. | ||||
* | * Added HTTP polling for Statistics Monitor Module (access via ↵ | Adam Frisby | 2009-11-11 | 1 | -1/+24 |
| | | | | | | | | | | | http://sim.com:httpport/monitorstats/regionUUID/) * Returns simple formatted XML document containing statistical data on the current sim. * Example: <data> <AgentCountMonitor>5.0000</AgentCountMonitor> ... </data> | ||||
* | Fixed XMLRPC return params | Mic Bowman | 2009-11-10 | 1 | -1/+1 |
| | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2009-11-09 | 11 | -43/+64 |
|\ |