Melanie
69b5ddceda
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:56 +00:00
Melanie
a1cd3b5b88
Change GodLevel to UserLevel so gods can teleport freely without having
...
to enter god mode first
2010-03-15 17:54:39 +00:00
Melanie
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
Melanie
898fa637c3
Merge branch 'careminster' into careminster-presence-refactor
2010-03-15 17:12:08 +00:00
Kitto Flora
8cbd0d3b5f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-03-14 16:23:12 -04:00
Kitto Flora
8198062610
RotLookAt repaired; debug msg cleanup.
2010-03-14 16:22:13 -04:00
dahlia
1e73e16fd0
flip UVs for profile faces
2010-03-13 18:41:36 -08:00
dahlia
2ebc4be99d
add a null check in ScenePresence constructor
2010-03-13 12:04:49 -08:00
CasperW
80e4068b3e
Fix the delay in llGiveInventory so that it only takes effect when giving inventory to an avatar (this now replicates SL behaviour)
2010-03-13 15:13:19 +01:00
dahlia
41a98b902b
correct some references which could produce erroneous prim face numbers
2010-03-12 22:05:22 -08:00
dahlia
1d14cf8c3f
some improvements to sculptmap alpha handling and LOD
2010-03-12 21:21:28 -08:00
Justin Clark-Casey (justincc)
4b81393274
minor: remove some mono compiler warnings
2010-03-12 23:21:45 +00:00
Justin Clark-Casey (justincc)
315fa06c75
refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule
2010-03-12 23:20:38 +00:00
Justin Clark-Casey (justincc)
6828d8ecbe
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 22:49:16 +00:00
Justin Clark-Casey (justincc)
582375509c
refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule
2010-03-12 22:48:49 +00:00
John Hurliman
5beb08be31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-12 14:40:21 -08:00
John Hurliman
3ea9fdea8b
Minor tweak to clean up SimianGrid asset service URLs
2010-03-12 14:39:51 -08:00
Justin Clark-Casey (justincc)
b9f5cd75bc
refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule
2010-03-12 22:39:15 +00:00
John Hurliman
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
Justin Clark-Casey (justincc)
19b4770fe7
start laoding griduser local connector, though it isn't invoked by anything yet
2010-03-12 22:18:48 +00:00
John Hurliman
9e3cdc4da5
Fixing the previous patch to work correctly with standalone mode
2010-03-12 13:28:16 -08:00
John Hurliman
0b5141d45b
Fixed SimianGrid connectors to gracefully exit if the required config sections are missing
2010-03-12 13:16:44 -08:00
Kitto Flora
1379ae4310
Fix Rotation Lock. NOTE: This version had poor border crossing control
2010-03-12 16:13:52 -05:00
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
Kitto Flora
7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05: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
Kitto Flora
f6f6ef1532
Dynamics Integration Part 1
2010-03-11 19:12:38 -05: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
689514a40a
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:12:10 +00: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
40873504dc
Merge branch 'master' into careminster-presence-refactor
2010-03-09 22:46:17 +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
unknown
fce9e499e4
- parcel blocking, region crossing blocking, teleport blocking
2010-03-09 22:38:58 +00:00
Melanie
80b5a95bb8
Revert "Adds Land Banning."
...
This reverts commit a87d7a1296
.
2010-03-09 22:29:02 +00:00