Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2009-12-31 | 3 | -0/+70 |
|\ | |||||
| * | Adds Friend Finding functionality. | Revolution | 2009-12-31 | 1 | -0/+23 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | Adds tons of packets. | Revolution | 2009-12-31 | 2 | -0/+47 |
| | | | | | | | | | | | | Applied with change: Changed spelling to Summary (from Summery) Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-29 | 3 | -9/+14 |
|\ \ | |/ | |||||
| * | Change teleports so the TeleportFlags are sent to the destination sim. It | Melanie | 2009-12-29 | 3 | -9/+14 |
| | | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-25 | 1 | -0/+13 |
|\ \ | |/ | |||||
| * | Enable the profile module to be replaced completely, even for the base | Melanie | 2009-12-25 | 1 | -0/+13 |
| | | | | | | | | profile data | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-24 | 3 | -0/+483 |
|\ \ | |/ | |||||
| * | No-op in this commit. Just increasing the tag number due to weirdnesses. | Diva Canto | 2009-12-23 | 1 | -1/+1 |
| | | |||||
| * | Library Module: allows adding folders/items to the Library from IAR files ↵ | Diva Canto | 2009-12-23 | 3 | -0/+483 |
| | | | | | | | | placed under bin/Library. This works only for standalones. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-23 | 1 | -1/+12 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2009-12-23 | 1 | -1/+7 |
| |\ | |||||
| | * | Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the ↵ | Diva Canto | 2009-12-22 | 1 | -1/+7 |
| | | | | | | | | | | | | stream can be closed. | ||||
| * | | Fix a bounds exception I came across in IAR restore | Melanie | 2009-12-23 | 1 | -0/+5 |
| |/ | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-21 | 1 | -2/+13 |
|\ \ | |/ | |||||
| * | Bug fix: in standalone, HGInventoryBroker needs to get the local inventory ↵ | Diva Canto | 2009-12-21 | 1 | -2/+13 |
| | | | | | | | | server URL from NetworkServersInfo. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-20 | 2 | -3/+14 |
|\ \ | |/ | |||||
| * | * Bug fix in HG: preserve the home region coordinates across multiple HG TPs. | Diva Canto | 2009-12-19 | 2 | -3/+14 |
| | | | | | | | | * Removed unnecessary debug messages. | ||||
* | | Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use. | CasperW | 2009-12-17 | 1 | -49/+78 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-15 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Make the HG map search recognize host names without ports. | Diva Canto | 2009-12-14 | 1 | -1/+1 |
| | | |||||
* | | 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 |