ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-14 17:55:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,971 Commits 5 Branches 96 Tags
aad17e751383069b799c6a78a3ac4e0ca1020a4d
Commit Graph

11971 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Clark-Casey (justincc)
aad17e7513 Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone 
Update information in StandaloneCommon.ini.example to reflect this
Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.).
Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files
Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
 2010-03-12 20:29:17 +00:00
Justin Clark-Casey (justincc)
7d738156fa Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-12 20:06:40 +00:00
Justin Clark-Casey (justincc)
f2de50bb14 Fix tests broken in 88771aeed3 
Adds MockUserAccountService and connects it up
Stops services being carried over between tests since this leads to hard to find bugs
Improves information and error reporting when loading plugins
 2010-03-12 19:31:14 +00:00
John Hurliman
8b1e33eb2d Fixed SimianGrid.ini to use GridCommon.ini(.example) 2010-03-12 10:31:43 -08:00
John Hurliman
3fa4988810 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-12 10:19:57 -08:00
Diva Canto
ed3288a8db Bug fix: "last location" login. 2010-03-12 10:16:21 -08:00
Justin Clark-Casey (justincc)
db61d66e74 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-12 17:58:25 +00:00
Justin Clark-Casey (justincc)
2313d14acb minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell the caller that the best match for an incoming request URI is invoked 2010-03-11 23:33:55 +00:00
Justin Clark-Casey (justincc)
e844524b41 Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6 
Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
 2010-03-11 21:04:56 +00:00
Justin Clark-Casey (justincc)
a578feefba very minor spacing adjustment 2010-03-11 20:20:38 +00:00
John Hurliman
2040649871 Adding the SimianGrid connectors 2010-03-11 11:19:02 -08:00
Mikko Pallari
265c24ec33 Changed some properties and methods from private to protected in LLLoginResponse and LLLoginService so they could be inherited better. 2010-03-11 07:56:44 -08:00
John Hurliman
b18ca2fee6 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-10 14:06:12 -08:00
John Hurliman
2af97b46ec * Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debug line, and commented the debug line out since it can quickly become noisy 2010-03-10 14:05:49 -08:00
Melanie
04a6b1caf8 Reintroduce a check that was dropped from permissions 2010-03-10 05:31:34 +00:00
Jeff Ames
f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Diva Canto
c5bb51b443 Changed a cryptic debug message and a wrong comment 2010-03-09 17:33:31 -08:00
Diva Canto
dbb2edf1a6 Fixed caching of user accounts. 2010-03-09 17:09:44 -08:00
Melanie
88771aeed3 Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator 
to use that stored value.
 2010-03-09 23:11:28 +00:00
Melanie
c7590bfd50 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-09 22:44:14 +00:00
unknown
98f91a252c - parcel blocking, region crossing blocking, teleport blocking 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-03-09 22:43:55 +00:00
John Hurliman
4b8af2e1aa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-09 12:19:11 -08:00
John Hurliman
01218093a6 * Typo fixes 
* Performance improvement in the expensive GenerateClientFlags()
 2010-03-09 12:06:53 -08:00
unknown
c135235000 MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData placeholder added. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-03-09 18:37:08 +00:00
Melanie
9ea6509a1c Comment a debug message that is a tad too spammy 2010-03-08 21:08:48 +00:00
Melanie
2362da2ad0 Add config option for switching between CSJ2K and BuggyJPEG. 2010-03-08 20:29:26 +00:00
John Hurliman
fa38cf3ee8 * Added code to support either CSJ2K or OpenJPEG texture decoding. Currently hardcoded to CSJ2K (so no functional change) but this could easily be switched to a config option 2010-03-07 17:03:56 -08:00
John Hurliman
d71ed7081b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-07 16:05:12 -08:00
John Hurliman
3ecccbb77d * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional) 2010-03-07 16:03:15 -08:00
Diva Canto
6367bdc696 Bug fix: correct name of methods in user accounts connector. 2010-03-07 11:35:25 -08:00
Diva Canto
26673af974 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-03-07 10:01:43 -08:00
Diva Canto
38b8c52762 Removed obsolete configs. 2010-03-07 10:01:23 -08:00
Melanie
89a739b45f Small consistency change 2010-03-07 16:05:24 +00:00
Melanie
2e5f7ec926 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-06 20:05:33 +00:00
unknown
2dcf73dd93 - supporting llTextBox 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-03-06 20:05:11 +00:00
Diva Canto
f4c165afe7 Bug fix: store correct position information upon logout. Fixes mantis #4608 2010-03-06 08:21:54 -08:00
Melanie
9fa9cfd215 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-06 11:58:19 +00:00
unknown
c0bc25059c - implementing server 1.38 functions 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-03-06 11:52:59 +00:00
Diva Canto
6aed4323a3 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-03-05 21:37:18 -08:00
Diva Canto
5171464ac1 Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere. 2010-03-05 21:36:45 -08:00
John Hurliman
27b8d13057 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-05 17:05:15 -08:00
John Hurliman
36afd0bfd1 * Cache packed throttle data to avoid repeated allocations in CheckForSignificantMovement() 
* Removed a lock on "return m_neighbours.Count" in GetInaccurateNeighborCount(). Dictionary<>.Count by itself does not benefit from locking
 2010-03-05 17:04:20 -08:00
John Hurliman
cde3c20ba3 * Fixed an order of operations bug in CheckForSignificantMovement() that was causing a flood of child updates to neighbors on login 
* Removed an unnecessary call to the presence service
 2010-03-05 17:01:31 -08:00
Justin Clark-Casey (justincc)
395f343498 refactor: Move DetachSingleAttachmentToInv to region module 
need to rationalize method names later
 2010-03-06 00:07:47 +00:00
Justin Clark-Casey (justincc)
e7422fe9b2 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-05 23:37:49 +00:00
Justin Clark-Casey (justincc)
71797af540 refactor: move another AttachObject method 2010-03-05 23:35:49 +00:00
Justin Clark-Casey (justincc)
b72c2dc6e8 refactor: move user inventory side of RezSingleAttachment to module 2010-03-05 23:29:24 +00:00
Justin Clark-Casey (justincc)
b88259db7d revert accidental Standalone.ini change 2010-03-05 23:19:22 +00:00
Justin Clark-Casey (justincc)
60553e62a3 refactor: begin to move attachments code into a region module 2010-03-05 23:18:47 +00:00
Justin Clark-Casey (justincc)
a3ac2cbdde automatically delete %temp% directory after running tests 
this prevents a huge cruft buildup
 2010-03-05 22:38:03 +00:00