ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-27 12:26:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,896 Commits 5 Branches 93 Tags
bbb4d6e4c934cd25615c98f2ee4500a5d28fa701
Commit Graph

214 Commits

Author SHA1 Message Date
Melanie
542e6b8af4 Merge branch 'master' into careminster-presence-refactor 2010-05-28 21:56:42 +01:00
Justin Clark-Casey (justincc)
191db0e6a4 get TestSaveIarV0_1() uncommented but not running as a test yet since I didn't get the authentication server to work and my brain is about to fizzle out my ears 2010-05-28 23:14:24 +01:00
Justin Clark-Casey (justincc)
a60ca5236c restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to work with the new UserAccountService/InventoryService 2010-05-28 21:37:48 +01:00
Justin Clark-Casey (justincc)
505cb82dee fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work 2010-05-28 21:14:15 +01:00
Justin Clark-Casey (justincc)
fff5459f4d Add ability to load IARs directly from URIs 
So, something like

load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar

Will load my IAR directly from the web.
 2010-05-28 20:07:15 +01:00
Justin Clark-Casey (justincc)
d72435693b refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers 2010-05-28 19:21:00 +01:00
Melanie
5693870fe2 Merge branch 'master' into careminster-presence-refactor 2010-03-30 21:34:27 +01:00
Diva Canto
efc0916a01 May fix mantis #4613 2010-03-27 22:48:15 -07:00
Dan Lake
62e0b53ca4 Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. 2010-03-19 15:16:44 -07:00
Melanie
4c2a51b1b5 Merge branch 'master' into careminster-presence-refactor 2010-03-18 20:09:04 +00:00
John Hurliman
33f5d0d1e9 * UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context 
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
 2010-03-15 14:17:17 -07:00
Melanie
028a87fe37 Merge branch 'master' into careminster-presence-refactor 
This brings careminster on the level of master. To be tested
 2010-03-03 02:07:03 +00:00
John Hurliman
df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman
71c6559a91 Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor 2010-02-22 14:10:19 -08:00
John Hurliman
7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Melanie
1f45e6c649 Merge branch 'master' into presence-refactor 
This brings presence-refactor up to master again
 2010-02-22 03:00:59 +00:00
Jeff Ames
2dea162073 Formatting cleanup. 2010-02-22 12:25:59 +09:00
Justin Clark-Casey (justincc)
c767a7901c forestall bug reports about the Command error: System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is 2010-02-19 22:30:46 +00:00
Melanie
a87a247f05 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:21:06 +00:00
Melanie
cfca9e1e81 Revert "Updates all IRegionModules to the new style region modules." 
This reverts commit ec3c31e61e.
 2010-01-29 07:20:13 +00:00
Melanie
b80ea00265 Merge branch 'master' into careminster 2010-01-26 14:53:14 +00:00
Revolution
ec3c31e61e Updates all IRegionModules to the new style region modules. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-23 15:18:52 +00:00
Diva Canto
c5ea783526 OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. 2010-01-11 07:51:33 -08:00
Diva Canto
53e83e5dbb * Starting to clean the house... 
* Fixed circular dependency
 2010-01-10 16:20:59 -08:00
Diva Canto
1e1b2ab221 * OMG! All but one references to UserProfileCacheService have been rerouted! 
* HG is seriously broken here
* Compiles. Untested.
 2010-01-10 10:40:07 -08:00
Diva Canto
25fdbd6cbc Less refs to UserProfileCacheService. Compiles but likely doesn't run. 2010-01-09 09:09:32 -08:00
Diva Canto
f11a97f12d * Finished SimulationServiceConnector 
* Started rerouting calls to UserService.
* Compiles. May run.
 2010-01-07 15:53:55 -08:00
Melanie
7f960cd595 Merge branch 'master' into presence-refactor 2010-01-04 21:41:33 +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
eebddcd5e6 Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells. 2009-12-28 01:24:15 +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
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
25b4160434 Merge branch 'master' into careminster 2009-11-25 08:45:41 +00: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
Jeff Ames
9f5c2acd12 Formatting cleanup. 2009-11-23 11:26:06 +09: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