ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-02 06:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,645 Commits 5 Branches 88 Tags
d2e17f4ffb3bbd4e377152bef097d47d481c6c5c
Commit Graph

269 Commits

Author SHA1 Message Date
Melanie
51bb311565 Add chat banning. Staff patch 2010-01-18 02:53:31 +00:00
Melanie
d22bdb5095 Merge branch 'master' into careminster 2010-01-09 12:02:48 +00:00
dahlia
1e899704c1 Adds config option "ForwardOfflineGroupMessages" to allow disabling of group messages forwarded while offline. Addresses Mantis #4457 2010-01-07 11:28:38 -08:00
Revolution
b67470af91 Fixes the newly added packets as per Melanie's request. 
Provisionally applied to fix the naming. Signatures are still subject to change.

Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-07 15:09:13 +00:00
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
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
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
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
Melanie
06f41bb017 Merge branch 'master' into careminster 2009-11-26 17:27:03 +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)
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
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
CasperW
8383bde768 Removed some extra debug chatter 2009-11-24 18:18:19 +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
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
Justin Clark-Casey (justincc)
7f5d0a6735 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-11-09 17:36:28 +00:00
Justin Clark-Casey (justincc)
716f70cd31 refactor out iar escaping 2009-11-09 17:34:07 +00:00
Justin Clark-Casey (justincc)
1ded7edde2 minor: correct slightly over-enthusiastic load iar logging message 2009-11-09 17:24:06 +00:00
Justin Clark-Casey (justincc)
7c5dc94cc8 fix load iar regression accidentally introduced in last commit 2009-11-09 17:22:18 +00:00
Justin Clark-Casey (justincc)
3c1f50127c minor: tweak load iar messages to be slightly less verbose 2009-11-09 17:20:30 +00:00
Justin Clark-Casey (justincc)
fbcf6ffc18 minor: provide updates on number of assets loaded while executing "load iar" 2009-11-09 17:17:25 +00:00
Justin Clark-Casey (justincc)
ae92bbcb95 refactor: break actual item load in iar into separate method 2009-11-09 17:04:05 +00:00
Justin Clark-Casey (justincc)
a0c1836fde minor: remove some old commented out load iar code 2009-11-09 16:43:35 +00:00
Justin Clark-Casey (justincc)
678a74e4f7 Tell the user when a 'save iar' has failed because the inventory path could not be found 2009-11-09 16:42:17 +00:00
Justin Clark-Casey (justincc)
a3105a34ca Implement human / escaping for inventory folders as well as items 2009-11-09 16:12:13 +00:00
Justin Clark-Casey (justincc)
6820cc93ec refactor path delimiter in iar utils 2009-11-09 16:08:17 +00:00
Justin Clark-Casey (justincc)
a7af92d5d0 minor: remove some mono compiler warnings 2009-11-09 16:03:15 +00:00
Justin Clark-Casey (justincc)
9b2592a960 refactor: make human iar escape char a constant rather than a magic char 2009-11-09 15:54:43 +00:00
Justin Clark-Casey (justincc)
668850b974 * for iars, allow item names/folders including "/" to be escaped using "\/" 
* also, "\" has to be escaped as "\\"
* add item name unit test for escaped characters
 2009-11-09 15:49:09 +00:00
John Hurliman
1cddc85078 Fixing the build break 2009-11-06 00:06:49 -08:00
John Hurliman
dfe4dc735a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2009-11-05 23:50:42 -08:00
John Hurliman
afef1ac191 Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen 2009-11-05 13:10:58 -08:00