5beb08be31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-12 14:40:21 -08:00
3ea9fdea8b
Minor tweak to clean up SimianGrid asset service URLs
2010-03-12 14:39:51 -08:00
b9f5cd75bc
refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule
2010-03-12 22:39:15 +00:00
3036aba875
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
...
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
19b4770fe7
start laoding griduser local connector, though it isn't invoked by anything yet
2010-03-12 22:18:48 +00:00
9e3cdc4da5
Fixing the previous patch to work correctly with standalone mode
2010-03-12 13:28:16 -08:00
0b5141d45b
Fixed SimianGrid connectors to gracefully exit if the required config sections are missing
2010-03-12 13:16:44 -08:00
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
7d738156fa
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 20:06:40 +00:00
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
8b1e33eb2d
Fixed SimianGrid.ini to use GridCommon.ini(.example)
2010-03-12 10:31:43 -08:00
3fa4988810
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-12 10:19:57 -08:00
ed3288a8db
Bug fix: "last location" login.
2010-03-12 10:16:21 -08:00
db61d66e74
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 17:58:25 +00:00
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
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
a578feefba
very minor spacing adjustment
2010-03-11 20:20:38 +00:00
2040649871
Adding the SimianGrid connectors
2010-03-11 11:19:02 -08:00
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
b18ca2fee6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-10 14:06:12 -08:00
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
04a6b1caf8
Reintroduce a check that was dropped from permissions
2010-03-10 05:31:34 +00:00
f58a0394ed
Formatting cleanup. Add copyright notices.
2010-03-10 13:15:36 +09:00
c5bb51b443
Changed a cryptic debug message and a wrong comment
2010-03-09 17:33:31 -08:00
dbb2edf1a6
Fixed caching of user accounts.
2010-03-09 17:09:44 -08:00
88771aeed3
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:11:28 +00:00
c7590bfd50
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-09 22:44:14 +00:00
98f91a252c
- parcel blocking, region crossing blocking, teleport blocking
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 22:43:55 +00:00
4b8af2e1aa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-09 12:19:11 -08:00
01218093a6
* Typo fixes
...
* Performance improvement in the expensive GenerateClientFlags()
2010-03-09 12:06:53 -08:00
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
9ea6509a1c
Comment a debug message that is a tad too spammy
2010-03-08 21:08:48 +00:00
2362da2ad0
Add config option for switching between CSJ2K and BuggyJPEG.
2010-03-08 20:29:26 +00:00
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
d71ed7081b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-07 16:05:12 -08:00
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
6367bdc696
Bug fix: correct name of methods in user accounts connector.
2010-03-07 11:35:25 -08:00
26673af974
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-03-07 10:01:43 -08:00
38b8c52762
Removed obsolete configs.
2010-03-07 10:01:23 -08:00
89a739b45f
Small consistency change
2010-03-07 16:05:24 +00:00
2e5f7ec926
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-06 20:05:33 +00:00
2dcf73dd93
- supporting llTextBox
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 20:05:11 +00:00
f4c165afe7
Bug fix: store correct position information upon logout. Fixes mantis #4608
2010-03-06 08:21:54 -08:00
9fa9cfd215
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-06 11:58:19 +00:00
c0bc25059c
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:52:59 +00:00
6aed4323a3
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-03-05 21:37:18 -08:00
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
27b8d13057
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-05 17:05:15 -08:00
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
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
John Hurliman