ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-27 09:15:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,361 Commits 5 Branches 106 Tags
fe034dc3e41582a4e6fb54a9d28dbbf1413a9a9f
Commit Graph

1080 Commits

Author SHA1 Message Date
Melanie
fe034dc3e4 Merge branch 'master' into careminster-presence-refactor 2010-04-05 18:12:29 +01:00
Diva Canto
cfa941adc7 Last commit was too fast... must override. 2010-04-03 12:14:57 -07:00
Diva Canto
8f68edfe12 * Fail storing user accounts in the remote connector. 2010-04-03 12:11:54 -07:00
Diva Canto
08ba34da03 First attempt at fixing mantis #4641. It's better but there are now some issues with permissions. 
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
 2010-03-31 21:30:44 -07:00
Melanie
21519d3311 Add missing licenses. Change relicensed LightShare module to proper BSD 
licensing.
 2010-03-31 13:33:18 +01:00
Melanie
4fefd05839 Merge branch 'master' into careminster-presence-refactor 
Remerge the LightShare bits that were pushed to core
 2010-03-31 04:38:19 +01:00
Melanie
19ae5e5dbb Adding the LightShare module and scripting API. This code was written by 
TomMeta and was contributed by Meta7.
 2010-03-31 04:23:51 +01:00
Melanie
7d917e7c5c Rename Meta7Windlight to LightShare 2010-03-30 23:29:03 +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
Justin Clark-Casey (justincc)
bfbf25c542 minor: Print out port that http servers are using 
do this in callers so that we know who is setting up these things
 2010-03-25 21:36:57 +00:00
Melanie
f020bd3206 Fix a nullref in permissions when returning objects via right-click 2010-03-20 15:49:39 +00:00
John Hurliman
5e65bef805 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-19 15:17: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
Dan Lake
859bc717a4 Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>). 2010-03-19 15:16:35 -07:00
Melanie
4c2a51b1b5 Merge branch 'master' into careminster-presence-refactor 2010-03-18 20:09:04 +00:00
Melanie
e0289bb432 Flesh out the new permission method 2010-03-18 19:58:21 +00:00
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
734b0416de 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:57:29 +00:00
Dan Lake
73e9b0be72 Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class. 
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
 2010-03-17 11:21:27 -07:00
John Hurliman
b4dcdffb50 Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time 2010-03-16 11:50:22 -07:00
Diva Canto
45ef3e9987 Get the local inner simulation service object to the handler so that there is no possibility of cascading requests when failures happen. 2010-03-15 20:32:36 -07:00
John Hurliman
4e180e84e2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-15 15:38:55 -07: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
d3f33acc1a Merge branch 'master' into careminster-presence-refactor 2010-03-15 17:23:35 +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)
582375509c refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule 2010-03-12 22:48:49 +00:00
Justin Clark-Casey (justincc)
b9f5cd75bc refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule 2010-03-12 22:39:15 +00: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
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
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
Melanie
06e351f1ef Revert "Adds land ejection and freezing. Adds more checks to land banning." 
This reverts commit 44d523518a.
 2010-03-09 22:28:52 +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
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
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
8180c72cbc Merge branch 'master' into careminster-presence-refactor 2010-03-06 12:37:24 +00:00