ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-03 00:46:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,540 Commits 5 Branches 94 Tags
53d3f46add698dd862c018e614778c1c19b0eda4
Commit Graph

818 Commits

Author SHA1 Message Date
Melanie
61ce884336 Merge branch 'master' into careminster 2010-01-03 21:43:39 +00:00
Jeff Ames
70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Melanie
b321c0a932 Merge branch 'master' into careminster 2009-12-31 21:53:39 +00:00
Revolution
8ca37dbefa Adds Friend Finding functionality. 
Signed-off-by: Melanie <melanie@t-data.com>
 2009-12-31 21:31:04 +00:00
Revolution
234d4e1105 Adds tons of packets. 
Applied with change: Changed spelling to Summary (from Summery)

Signed-off-by: Melanie <melanie@t-data.com>
 2009-12-31 21:24:56 +00:00
Melanie
67cfac0cf1 Merge branch 'master' into careminster 2009-12-29 18:41:45 +00:00
Melanie
0b5cdc539c Change teleports so the TeleportFlags are sent to the destination sim. It 
can now determine if a connection is from login, teleport or crossing.
Needed for a meaningful banlines implementation
 2009-12-29 18:35:06 +00:00
Melanie
59a841d69c Merge branch 'master' into careminster 2009-12-25 23:17:08 +00:00
Melanie
8d36d7beed Enable the profile module to be replaced completely, even for the base 
profile data
 2009-12-25 23:10:07 +00:00
Melanie
0054afd39b Merge branch 'master' into careminster 2009-12-24 16:45:27 +00:00
Diva Canto
2c3d7972b9 No-op in this commit. Just increasing the tag number due to weirdnesses. 2009-12-23 19:43:50 -08:00
Diva Canto
1fa938aab0 Library Module: allows adding folders/items to the Library from IAR files placed under bin/Library. This works only for standalones. 2009-12-23 17:31:30 -08:00
Melanie
6eecbc95e4 Merge branch 'master' into careminster 2009-12-23 21:22:19 +00:00
Melanie
f2d2073f2b Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-12-23 21:21:22 +00:00
Melanie
c05a35cc71 Fix a bounds exception I came across in IAR restore 2009-12-23 21:20:48 +00:00
Diva Canto
f45a69821b Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the stream can be closed. 2009-12-22 21:00:46 -08:00
Melanie
84a1a0a729 Merge branch 'master' into careminster 2009-12-21 22:07:22 +00:00
Diva Canto
68187f7245 Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo. 2009-12-21 07:44:17 -08:00
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