Melanie
c61e998580
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-11 22:09:24 +01:00
Justin Clark-Casey (justincc)
0dce4f1997
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
...
This reverts commit 3525195bc9
.
2010-06-11 22:13:36 +01:00
Melanie
694c8ab588
Remove the lastmap stuff from the map module, also remove a bunch of comments
...
that no longer reflect actual conditions
2010-06-11 22:08:43 +01:00
Justin Clark-Casey (justincc)
3525195bc9
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
...
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
2010-06-11 21:55:18 +01:00
Justin Clark-Casey (justincc)
8531da37d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 21:18:53 +01:00
Justin Clark-Casey (justincc)
1a16a92a62
create inactive test for iar folders/items merged with existing paths
...
add various helper functions for simplifying test readability
2010-06-11 21:18:09 +01:00
Diva Canto
5d099182c3
Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers.
2010-06-11 13:14:07 -07:00
Diva Canto
556e91d33c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-11 12:48:06 -07:00
Diva Canto
d184fef4dc
Inventory offers and subsequent notifications of acceptance/decline now working across the board.
2010-06-11 12:47:47 -07:00
Melanie Thielker
c98b10fc8c
Remove the cm* function namespace
2010-06-11 17:48:41 +01:00
Melanie Thielker
7c4cf46bac
Rename CM files to LS
2010-06-11 17:42:41 +01:00
Melanie Thielker
ad87bab271
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:30:23 +01:00
Melanie Thielker
b64f42fa41
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:03:45 +01:00
Diva Canto
7f349d61cb
Better friends notification: get rid of OnLogout and use OnClientClose for sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous.
2010-06-11 06:32:24 -07:00
Diva Canto
2e1269e4ca
Bug fix on friends notifications. OnClientClose and OnLogout ordering are unpredictable; when OnClientClosed happened first, it was removing the friends list, which would prevent OnLogout notifications to go out.
2010-06-10 21:59:12 -07:00
Diva Canto
b2b6799f1c
Added more debug messages to try to pinpoint where login is failing for nebadon.
2010-06-10 18:26:04 -07:00
Diva Canto
e80cb815df
Bug fix on attachments: attach->drop->attach works now.
2010-06-09 12:51:24 -07:00
Diva Canto
2a71df1285
Reverting that last permissions check upon drop. Looks like all dropped attachments are deleted from inventory.
2010-06-09 12:22:25 -07:00
Diva Canto
18bfe58de8
Bug fix on attachments: don't delete the item from inventory when it's dropped on the ground.
2010-06-09 11:24:37 -07:00
Diva Canto
8fc5eda2c9
Bug fix in attachments: when attaching from inworld the item's parentFolderID was wrong.
2010-06-09 10:55:37 -07:00
Melanie
1be53b58a7
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:02:01 +01:00
Melanie
796e9b5cb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-09 03:52:24 +01:00
Melanie
16439fa354
If a script is deleted before it gets compiled, don't even bother to try
...
compiling it
2010-06-09 03:51:43 +01:00
Dan Lake
ca2abc43ad
Refactor SendCoarseLocations for better performance. Instead of computing list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations.
2010-06-08 16:44:18 -07:00
Diva Canto
9b9804a498
* Changed CreatorIDs consistently to varchar(128)
...
* Deleted redundant migration for assets in SQLite
* Rewrote XInventory migrations in SQLite in the new style
2010-06-08 15:47:14 -07:00
Justin Clark-Casey (justincc)
21246395be
Comment out the attachment update reordering mechanism in LLClientView since this doesn't appear necessary when the prim priorities are adjusted so that root prim updates are always sent before child prim updates.
2010-06-08 15:38:53 +01:00
Justin Clark-Casey (justincc)
db73b1c64e
Adjust object update priorities such that root prims are sent to the viewer before child prims.
...
This was originally a fix for huds, since child prims fail to display if the viewer doesn't receive the root prim update first.
However, on the advice of jhurliman, this has been done for all objects, both ordinary and attachments.
The separate mechanism in LLClientView which prevents child prim updates being sent out first is still present temporarily.
This is a foreport of the equivalent fix in 0.6.9-post-fixes, though that was for attachments only.
2010-06-08 15:32:18 +01:00
Justin Clark-Casey (justincc)
b6076d7b33
Reduce number of full updates sent on region crossing for attachments/huds to 1 from 3
...
This is one step towards reducing hud glitches on region crossing, since the viewer fails to display prims if it receives child full updates before the root prim full update
This commit also introduces a mechanism in LLClientView to stop child attachment updates ever going out before the root one
This is a very temporary mechanism and will be commented out when the next step of the fix (to give root prims higher udpate priority) is committed
This code is a foreport from the equivalent changes in 0.6.9-post-fixes
2010-06-08 15:07:57 +01:00
Melanie Thielker
d91bd7646d
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:11:30 +01:00
Diva Canto
ab3afd5f42
* Bug fix in TP home: typo in unpacking of GridUserInfo.
...
* Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions.
2010-06-05 09:39:09 -07:00
Diva Canto
fe3e1c67ae
Bug fix: update the list of friends upon MakeRoot, because child agents don't get notified of new friendships.
2010-06-05 06:56:36 -07:00
Justin Clark-Casey (justincc)
63797445be
various refactorings on methods to replicate IAR paths to user inventory in order to improve readability
2010-06-05 00:48:33 +01:00
Justin Clark-Casey (justincc)
3c3df9f3e9
refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()
2010-06-04 23:34:42 +01:00
Justin Clark-Casey (justincc)
72bd68a21f
add ability for load iar/save iar to take in arbitrary options
...
not used for anything yet
2010-06-04 22:17:23 +01:00
Justin Clark-Casey (justincc)
0526d3a535
bring TestLoadIarV0_1AbsentUsers() back online
2010-06-04 21:19:37 +01:00
Justin Clark-Casey (justincc)
a08ace300b
bring TestIarV0_1WithEscapedChars() back online
2010-06-04 21:15:25 +01:00
Justin Clark-Casey (justincc)
f523c2033d
bring test TestLoadIarV0_1ExistingUsers() back online
2010-06-04 21:11:13 +01:00
Justin Clark-Casey (justincc)
df2bcf7b6b
remove pointless mock user account service since the real one can now be easily configured for test purposes
2010-06-04 20:56:24 +01:00
Justin Clark-Casey (justincc)
f319d2ef5e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-04 20:44:01 +01:00
Justin Clark-Casey (justincc)
75878c8f43
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
...
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
Diva Canto
281eb0c626
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-04 11:00:29 -07:00
Diva Canto
952029380a
Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims.
2010-06-04 10:59:59 -07:00
Justin Clark-Casey (justincc)
041f253e2b
minor: comment out region interface registration log msg I accidentally left in last week
...
also changes one log message to print out full exception stack trace on both mono/.net instead of just .net
2010-06-04 18:08:40 +01:00
Melanie Thielker
aa5a346a68
Add a forgotten security check. Make the new functions only work on prims
...
owned by the host prim owner.
2010-06-02 01:21:55 +01:00
Melanie Thielker
53e96dccef
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:21:50 +01:00
Melanie Thielker
a863eb9da3
One should not lock null objects.
2010-06-01 19:01:57 +01:00
Melanie
9c3c020697
Lock the object queue when dequeueing
2010-06-01 15:08:45 +01:00
Melanie
5270e54268
Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
...
needed libraries
2010-06-01 14:20:39 +01:00
Melanie Thielker
4867dd135d
Fix prim returns I broke earlier
2010-06-01 02:12:56 +01:00
Melanie Thielker
a5728cc91c
Fix prim returns I broke earlier
2010-06-01 02:10:53 +01:00
Melanie Thielker
f29cb57bf1
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:10:22 +01:00
Melanie Thielker
bde01e26e1
Add a method to get the bounding box and root prim offsets within it for
...
a group of prims.
2010-06-01 02:10:11 +01:00
Melanie Thielker
2fce7d9bcf
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 02:10:08 +01:00
Melanie Thielker
be69259981
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 01:39:54 +01:00
Melanie Thielker
e515467c5e
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 17:55:56 +01:00
Melanie Thielker
8df9f272eb
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-30 23:57:13 +01:00
Melanie Thielker
f1a1d7a521
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 14:42:58 +01:00
Melanie Thielker
bfcac0ede8
Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs
...
would be the IDs of the prim owners in whose prims these functions would
run. This changes it so the UUID is the SCRIPT CREATOR instead. Further,
osfunctions limited by uuid will not run if the creator and owner differ
and the owner has mod rights on the script.
There is still a danger in passing moodifiable scripts to others, as they
can insert a harmful function, then remove the mod rights to make it runnable.
As before, care needs to be taken, but where it was modable prims that were
the risk before, modable scripts are the weak spot now.
In cases where prim owner == script creator == script owner, nothing will
change.
2010-05-30 12:45:16 +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)
14c39461c2
minor: remove mono compiler warning
2010-05-28 19:41:13 +01:00
Justin Clark-Casey (justincc)
b1298fca0a
tidy up help information on load oar and save oar
2010-05-28 19:36:30 +01:00
Justin Clark-Casey (justincc)
d72435693b
refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers
2010-05-28 19:21:00 +01:00
Justin Clark-Casey (justincc)
6b568af565
Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.
...
This is going to be the right behaviour in all cases, I should think.
This means that avatars in region when an oar is loaded do not lose their attachments
2010-05-28 18:49:32 +01:00
Justin Clark-Casey (justincc)
877fe774ef
Simplify AddFullUpdateToAvatars()/AddPartialUpdateToAvatars() by calling the object's corresponding single avatar update method, rather than calling the sceneviewer directly
2010-05-28 17:58:51 +01:00
Justin Clark-Casey (justincc)
596001632b
remove redundant ScenePresence.QueuePartForUpdate() - every place in the code calls SceneViewer.QueuePartForUpdate() directly
2010-05-28 17:53:57 +01:00
Melanie Thielker
8fb706716b
Prevent a null ref
2010-05-27 19:09:06 +01:00
Melanie
a48d7f62a7
Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"
...
Some other stuff snuck in.
This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
2010-05-27 19:02:20 +01:00
Melanie Thielker
6b6425aa5e
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast
2010-05-27 18:44:15 +01:00
Melanie Thielker
9ac8d2de79
Just because there is an agent update handler, that doesn't mean there is
...
a pre agent update handler. Null check these separately.
2010-05-26 18:25:53 +01:00
dahlia
5e719d13ef
fix sculpt normal direction for mirrored plane sculpts
2010-05-24 19:15:04 -07:00
Melanie
7d9b316ce6
Change the way alpha is interpreted on prim text. Manris #4723
2010-05-24 23:37:47 +01:00
Justin Clark-Casey (justincc)
c7c9edd049
minor: expand upon comments about not scheduling two full updates for attachments
2010-05-24 20:11:06 +01:00
Melanie
f84f0dbd51
Remove an unneeded conditional
2010-05-23 06:12:40 +01:00
Justin Clark-Casey (justincc)
b2197e3b94
Apply http://opensimulator.org/mantis/view.php?id=4632
...
Adds dialog methods for MRM.
Thanks ziah.
2010-05-21 23:37:05 +01:00
Justin Clark-Casey (justincc)
074937e0e5
Apply http://opensimulator.org/mantis/view.php?id=4627
...
Adds OwnerId and CreatorId properties to MRM.IObject
2010-05-21 23:34:47 +01:00
Justin Clark-Casey (justincc)
e5bcd8b341
Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628
...
This prevents a ground-sitting avatar from being moved about in mouselook
Thanks mirceakitsune!
2010-05-21 23:29:37 +01:00
Justin Clark-Casey (justincc)
9e61e120a1
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 23:12:47 +01:00
Mikko Pallari
4e45718833
Added overload of SendGenericMessage to LLClientView with string list as parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch.
2010-05-21 23:08:07 +01:00
Justin Clark-Casey (justincc)
6918446fcd
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 22:17:58 +01:00
John Hurliman
d0eecf0398
Added a sanity check before using m_config in the Scene constructor
2010-05-21 14:17:03 -07:00
John Hurliman
abd5d1f747
* Added code comments to Prioritizer.cs that document how to add a new update priority policy
2010-05-21 14:04:10 -07:00
Justin Clark-Casey (justincc)
89f1ddb0a5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 21:58:55 +01:00
Justin Clark-Casey (justincc)
5287c5f7fb
rearrange SceneGraph.AddSceneObject() to return earlier if an object with that uuid is already in the scene
...
this means that we don't perform pointless work
2010-05-21 21:57:56 +01:00
John Hurliman
93ef65c690
* Moving all of the prioritization/reprioritization code into a new file Prioritizer.cs
...
* Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now
* Improved the distance and front back policies to always give your avatar the highest priority
2010-05-21 13:55:36 -07:00
Justin Clark-Casey (justincc)
4b518e0288
minor: remove LongRunning test designator from TestAddSceneObject() since it isn't, really
2010-05-21 21:48:47 +01:00
Justin Clark-Casey (justincc)
76135eec5b
add test to make sure that adding an object where one already exists in the scene with that uuid fails
2010-05-21 21:46:41 +01:00
Justin Clark-Casey (justincc)
8d968249ec
extend TestAddSceneObject() to check Scene.AddNewSceneObject() return boolean
...
improve test to retrieve object by known uuid rather than dynamically assigned local id
2010-05-21 21:38:47 +01:00
Justin Clark-Casey (justincc)
f83acf533b
Fix a problem where SceneGraph.AddSceneObject() would return false on successfully adding an object rather than true, in defiance of its method documentation
...
This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added.
2010-05-21 21:22:53 +01:00
Melanie
4e23acb133
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-21 21:04:17 +01:00
Melanie
2b5b2f4e60
Add a new priority scheme that works like FrontBack, but completely deprioritizes
...
static prims, creating a hierarchy as follows:
0 == own avatar < other avatars < pysical prims < static prims
For a child agent, simply acts like FrontBack
2010-05-21 21:02:26 +01:00
Justin Clark-Casey (justincc)
721c1085da
make oar object filename/pathname creation a helper method
...
reused in both tests and oar code
reduction in checking is outweighed by greater test clarity
2010-05-21 20:43:11 +01:00
Justin Clark-Casey (justincc)
74ef1ed36f
add prim item and test asset save in save oar unit test
2010-05-21 19:36:39 +01:00
Justin Clark-Casey (justincc)
78a0fd5281
Only send dialogs and notices to root agents, not child agents
2010-05-21 17:22:39 +01:00
Melanie
1d6ab445ab
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 15:31:27 +01:00
John Hurliman
9f2d1e9294
* Made PriorityQueue non-generic so it natively understands EntityUpdate structs
...
* Replaced the per-avatar seen update tracking with update flag combining, to avoid overwriting full updates with terse updates
2010-05-20 23:53:27 -07:00
Melanie Thielker
792e149c7e
Ensure that the first update sent out for any given prim is a full update
2010-05-21 05:13:31 +01:00
Diva Canto
13c22015e5
Removed sessionID from GridUserservice again. Removed parcel crossing detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface.
2010-05-20 15:14:14 -07:00
unknown
beed74096c
Merging slimupdates2
2010-05-20 12:28:13 -07:00
unknown
56f3cb6da0
* Don't send texture data for prims in ImprovedTerseObjectUpdate packets unless we were asked to
2010-05-20 12:04:12 -07:00
unknown
59dec2f989
* Added sessionID to IGridUserService.SetLastPosition(), as some connectors will want to track position against sessionID instead of userID
...
* Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing
2010-05-20 11:51:57 -07:00
Diva Canto
b7e6b58857
Fixes mantis #4622 .
2010-05-16 09:01:27 -07:00
Teravus Ovares (Dan Olivares)
d4192dcb2e
* Revert last commit for now at Melanie_T's request.
...
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
Teravus Ovares (Dan Olivares)
019925bb2f
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-15 23:22:07 -04:00
Teravus Ovares (Dan Olivares)
dc1a3e9787
* Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files.
2010-05-15 23:21:36 -04:00
Diva Canto
2a1e45f657
Finalized the client's TCP IP address verification process for HG1.5.
2010-05-15 19:25:14 -07:00
unknown
9dbe90801b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-15 02:20:47 -07:00
Dan Lake
36bcab5f07
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-15 02:20:23 -07:00
Justin Clark-Casey (justincc)
98f2b798ff
Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch
2010-05-15 01:07:45 +01:00
Justin Clark-Casey
3d72a73b22
Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
...
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:25:14 +01:00
OpenSim Master
4c740e1717
Implements three new OSSL functions for parcel management: osParcelJoin joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed.
2010-05-13 14:22:48 -07:00
unknown
5d8638ed88
Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is working)
2010-05-12 16:05:48 -07:00
unknown
bf5c81d77e
* Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
2010-05-12 15:59:48 -07:00
Melanie
31dc77d8a1
Return agents when angle is PI
...
Fixes Mantis #4703
2010-05-10 04:02:56 +01:00
Melanie
3e8ceb3509
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-10 03:57:44 +01:00
Melanie
89c762209c
Fix a null ref on region crossing
2010-05-10 03:57:17 +01:00
Diva Canto
b233a4b2ca
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
...
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
Diva Canto
c1fe07b022
* Added missing loggout notification to home grid upon agents logging out in foreign grids.
...
* Added missing config in StandaloneHypergrid.ini
2010-05-08 12:21:17 -07:00
Diva Canto
d72769930a
More cleaning on presence. Friends online/offline works again.
2010-05-08 07:44:07 -07:00
Diva Canto
bfb7a49990
Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete fields.
2010-05-07 21:56:14 -07:00
Diva Canto
15562017f2
These files are part of the GridUserService write-up.
2010-05-07 21:32:02 -07:00
Diva Canto
a58859a0d4
GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
...
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
dahlia
eb6d63ab8e
improve handling of undersize sculpt textures
2010-05-06 23:02:24 -07:00
dahlia
39c5ddc837
corrections for face numbering and uv mapping, mostly for spheres - sync with PrimMesher r56
2010-05-06 22:08:59 -07:00
dahlia
5d1e9947ed
Sculpt meshing refactoring - improves mesh accuracy and UV mapping
...
Sync with PrimMesher r55
2010-05-06 21:36:27 -07:00
Melanie
6182d71326
Also remove sale and search flags on god owner change.
2010-05-07 00:52:52 +01:00
Melanie
907fce8406
Remove land that is being abandoned from search. This is now consistent with
...
sale and reclaim.
2010-05-07 00:50:26 +01:00
Melanie
9ecebcdf13
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
Causes an exception within HttpServer, headers have already been sent.
This reverts commit 8187fccd25
.
2010-05-06 16:39:21 +01:00
Melanie
533bd1bd9b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-06 16:08:24 +01:00
Melanie
adc34c7129
Ensure the show in search flag is cleared on ownership change. Also, when
...
land is reclaimed, reset it's for sale flags so it can't be bought again right
away.
2010-05-06 16:07:15 +01:00
Diva Canto
53594e599e
* Fixes Library bugs in grid mode. Partly a missing check and partly a missing configuration.
...
* Made previous Robust config changes consistent in Robust.HG.ini.example
2010-05-05 21:12:13 -07:00
Melanie
8b4f729a21
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-05 23:58:14 +01:00
Diva Canto
ebc3726d52
Added copying of Viewer field to the agent circuit data that is being passed on TPs and crossings.
...
(XmlRpcGroups files want to be committed too)
2010-05-05 16:54:48 -07:00
Melanie Thielker
2b48ed60ec
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-05 23:41:57 +01:00
Melanie
ad2039a8c4
Stab a test fail
2010-05-05 22:48:05 +01:00
Melanie Thielker
e45f5ac126
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-05 22:33:22 +01:00
Melanie Thielker
2ebe148266
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01:00
Melanie Thielker
7aed89a8d0
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 18:51:01 +01:00
Melanie
8187fccd25
Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:12:52 +01:00
Melanie Thielker
34d882b70d
Add perms check to the teleport home client command handlers.
2010-05-04 23:15:07 +01:00
Melanie Thielker
3761f79971
Strip estate message sending out from the estate management module and
...
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 21:26:10 +01:00
Melanie Thielker
5a4cef6b36
make the events more useful by providing the source region
2010-05-04 18:55:24 +01:00
Melanie Thielker
d997fc7b76
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 18:36:45 +01:00
Melanie Thielker
9cf0077bf9
Add "reload estate" command to sims
2010-05-04 16:11:06 +01:00
Melanie Thielker
6eea0a3931
Allow reloading of estate settings into a running region. Move sun update
...
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 15:52:36 +01:00
Melanie
f61b879f2d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 21:25:40 +01:00
Melanie Thielker
92561aef8d
Store given items in correct parent folder. Fixes items given to offline avatars
...
not getting lost.
2010-05-03 21:25:02 +01:00
Diva Canto
b10811a13b
Assorted bug fixes in hypergrid linking.
2010-05-03 09:50:55 -07:00
Melanie
1494c84f56
Fix a bug in owner change notification
2010-05-03 02:40:52 +01:00
Melanie
75063e8f60
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 01:31:32 +01:00
Teravus Ovares (Dan Olivares)
d6bfc490f7
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-02 20:45:01 -04:00
Teravus Ovares (Dan Olivares)
b836249926
* Untested Suggestion from lkalif to change
...
remoteClient.SendMapBlock(blocks, 0);
to
remoteClient.SendMapBlock(blocks, 2);
in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2010-05-02 20:44:34 -04:00
Melanie
7a8ad1ceb2
Make in-place sale send CHANGED_OWNER again
2010-05-03 01:30:57 +01:00
Melanie
45301d8a49
Defer sending of CHANGED_OWNER to make it work on rezzed objects and
...
attachments in addition to objects sold in place
2010-05-03 01:14:38 +01:00
Melanie
af0ffb2a5a
Add URL_REQUEST_* script constants
2010-05-03 00:15:55 +01:00
Diva Canto
cbb297bc79
Renamed HGInventoryBroker2 to HGInventoryBroker.
2010-05-02 10:37:57 -07:00
Diva Canto
052580ef44
Deleted HGInventoryBroker, so that the new one can take its name.
2010-05-02 10:32:47 -07:00
Diva Canto
bd49985afa
Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory.
2010-05-02 10:31:35 -07:00
Melanie Thielker
177048a651
Fix linking issue introduced in my earlier commit
2010-04-30 20:16:21 +01:00
Melanie
23282935f1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 19:29:21 +01:00
Diva Canto
5fda81e6bb
* XInventory fairly tested, including for HG. Almost ready to switch.
...
* Removed a few buglets and added better exception handling.
2010-04-30 11:39:02 -07:00
Melanie
d1fcd22173
Fix a null ref from trying to access a dictionary that was never initialized.
2010-04-30 19:28:44 +01:00
Melanie
0ea908291d
Fix some symbol errors
2010-04-30 12:08:08 +01:00
Melanie
4cc06ff993
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 11:47:24 +01:00
Melanie
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
Diva Canto
638dc8d3c2
Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.
2010-04-29 20:09:11 -07:00
Diva Canto
6a4fae123a
Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished.
2010-04-29 11:39:13 -07:00
Melanie
aba5db9ed4
Merge branch 'minor-stuff'
2010-04-28 19:38:29 +01:00
unknown
aa56953411
Compiler.cs contained method GetCompilerOutput which, apparently,
...
was not used, but exactly the same path was calculated inline.
This patch does some minor refactoring by replacing inline path
calculation with GetCompilerOutput. This doesn't actually affect anything,
just minor prettifying of the code
2010-04-28 12:52:36 +03:00
unknown
806a2555f5
Spelling in FriendsModule.cs: "filed to load" -> "failed to load"
2010-04-28 11:49:53 +03:00
unknown
fb7458be31
Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
...
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
Diva Canto
3f9d38538e
XInventory connector/handler showing signs of life. Tested, but needs more testing.
2010-04-27 11:01:56 -07:00
Diva Canto
76e87181b2
RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet.
2010-04-26 20:28:37 -07:00
Melanie
edde0be0a0
Fix build break.
2010-04-27 01:11:14 +01:00
Melanie
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
Diva Canto
2ac00b7f96
* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
...
* IRegionModule.cs wants to be committed too -- EOF.
2010-04-26 14:52:22 -07:00
Justin Clark-Casey (justincc)
10e18f465e
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
2010-04-23 21:29:09 +01:00
dahlia
b5ec101cc8
add a comment about deprecating IRegionModule
2010-04-23 12:06:32 -07:00
Melanie
459323a931
Make the detection cone in attachments face in the direction of the avatar,
...
not the relative rotation of the attachment towards the avatar.
2010-04-21 19:44:19 +01:00
Justin Clark-Casey (justincc)
50f327ef5c
minor: change a comment and replace some magic numbers with the AssetType enum
2010-04-19 21:34:42 +01:00
Justin Clark-Casey (justincc)
6b963e73d9
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-19 21:28:30 +01:00
Justin Clark-Casey (justincc)
524a2a9e26
Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
...
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
2010-04-19 21:25:59 +01:00
Justin Clark-Casey (justincc)
da83ee28be
If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods.
...
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
2010-04-19 21:02:36 +01:00
Justin Clark-Casey (justincc)
855eda844f
log problems when an asset request through the UDP TransferRequest channel goes wrong
2010-04-19 20:06:55 +01:00
Melanie Thielker
af3e477e4b
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 17:28:43 +01:00
Melanie
3e63ce6d9d
Make script asset fetches synchronous. Script instantiation synchronization
...
will not work if the instance is not created when the method returns.
2010-04-19 15:29:35 +01:00
Melanie
a89208b465
Stopgap measure. Disable the recent script startup changes until I can cure the
...
race condition.
2010-04-19 14:14:31 +01:00
Melanie Thielker
689b647790
And some more rez modes that weren't covered before
2010-04-19 10:54:41 +01:00
Melanie
b39db7e9e4
Also enable scripts rezzed into prims
2010-04-19 10:43:25 +01:00
Melanie
21cad5d3ac
All scripts are now created suspended and are only unsuspended when the object
...
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
Justin Clark-Casey (justincc)
26e3884237
refactor: move DeatchObject() into the AttachmentsModule
2010-04-17 00:00:45 +01:00
Justin Clark-Casey (justincc)
ab3af43d5e
refactor: remove now unused internal method SendAttachEvent()
2010-04-16 23:29:36 +01:00
Justin Clark-Casey (justincc)
57c293d604
refactor: crudely move DetachSingleAttachmentToGround() over to the AttachmentsModule
2010-04-16 23:15:13 +01:00
Justin Clark-Casey (justincc)
45563e20e0
minor: correctly print out missing item id when it can't be found rather than a NullReferenceException
2010-04-16 22:57:44 +01:00
Justin Clark-Casey (justincc)
17d023ba5b
refactor: crudely move the RezMultipleAttachments() method into the AttachmentsModule
2010-04-16 22:54:25 +01:00
Justin Clark-Casey (justincc)
e9926d13cf
minor: use the static ascii and utf8 encodings instead of instantiating our own
2010-04-16 22:38:42 +01:00
Justin Clark-Casey (justincc)
bf3956aeb0
Add --skip-assets option to load oar.
...
This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
2010-04-16 22:29:11 +01:00
Justin Clark-Casey (justincc)
cf46735856
add a missing initialization of the m_memoryCache in XmlRpcGroupsServicesConnectorModule
...
the lack of this caused me a NullReferenceException when calling some groups methods directly though in principle it would also fail in other situations
2010-04-16 21:39:27 +01:00
Justin Clark-Casey (justincc)
5459a90fc6
minor: stop irc bridge warning about not attached to regions if it's not been turned on in the first place
2010-04-16 21:23:01 +01:00
Justin Clark-Casey (justincc)
9131a0d4a4
minor: stop datasnapshot issuing a warning log message if it's disabled
2010-04-16 21:12:09 +01:00
John Hurliman
a7449a82bc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-14 19:49:02 -07:00
John Hurliman
8fa13e3871
Patch from mcortez to add basic caching to the groups module. This prevents database/network explosions when you have a significant number of group-owned prims in a scene
2010-04-14 19:48:40 -07:00
Justin Clark-Casey (justincc)
e0f8362e7a
minor: add some documentation around the asset udp request path and replace some magic numbers with libomv enums
2010-04-14 22:31:11 +01:00
Robert Adams
54a5b6f434
Reduce number of AvatarAnimations sent with large number of avatars
2010-04-13 18:50:08 -07:00
dahlia
3d0860ae61
thanks lkalif for Mantis #4676 - a patch that adds support for inventory links
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-04-12 17:10:51 -07:00
John Hurliman
3f6c4c150e
* Adds IAssetService.GetCached() to allow asset fetching from the local cache only
...
* Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer
* Sanity check for null reference in LLClientView.RefreshGroupMembership()
2010-04-08 12:31:44 -07:00
Diva Canto
80346ad2e2
* May fix mantis #4603 .
...
* My local git wants to commit the groups files for line endings, I'm gonna let it do it.
2010-04-05 19:56:03 -07:00
Justin Clark-Casey (justincc)
48d2e8309a
check group membership and powers with the groups module rather than just the client's active group id
...
this resolves the earlier issue where notecards/scripts shared with group could only be edited if the user had that group active
2010-04-05 20:44:19 +01:00
Justin Clark-Casey (justincc)
1be19c7f42
log exceptions that end up at the top of a asynchronous viewer packet method call rather than swallowing them
2010-04-05 19:46:43 +01:00
Justin Clark-Casey (justincc)
9ecad50419
Partially implement share with group option for object inventory items
...
If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off.
If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active.
However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway
2010-04-05 19:37:02 +01:00
Melanie
dc58c985e8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-04 02:24:52 +01:00
Melanie
936e08e20e
Patch from mcortez. This appears to be a huge change to the groups module
...
and I can't say if this is beneficial or destructive due to the way it
was delivered (zipfile). Pushing this on faith alone.
2010-04-04 02:23:53 +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
6485c576a1
* Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
...
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -07:00
John Hurliman
35c82a31db
Don't append ACKs to zerocoded packets. Although this should fine in theory, I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic
2010-04-02 16:25:14 -07:00
Melanie
a004d88bf3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-02 14:53:52 +01:00
Melanie
4b98d0db92
Adding the groups update (Mantis #4646 )
...
Thanks, mcortez.
2010-04-02 14:53:33 +01:00
Justin Clark-Casey (justincc)
e0eba26f7b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-01 23:59:00 +01:00
Justin Clark-Casey (justincc)
938905df1e
oops, add file missing from last commit
...
refactor out redundant method from GroupsMessagingModule
2010-04-01 22:45:01 +01:00
Justin Clark-Casey (justincc)
c33b1de9df
expose methods that allow region modules to send messages to groups
2010-04-01 22:37:20 +01: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
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
ec637e2b8c
Committing the LightShare code, which was developed by TomMeta of Meta7.
...
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
Justin Clark-Casey (justincc)
8cb81bdc9b
minor: commented out code removal
2010-03-30 17:06:30 +01:00
Justin Clark-Casey (justincc)
696d711d15
Completely prevent full update packets being sent after kill object packets
...
If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog
This patch prevents this by recording kills in LLClientView
2010-03-30 17:04:26 +01:00
Justin Clark-Casey (justincc)
24fc4703d0
fix build break. First argument of GetGroupRecord is not a uuid
2010-03-29 22:02:02 +01:00
Melanie
e7e56e0143
Remove a redundant method body
2010-03-29 19:50:24 +01:00
Melanie
607ed61ec2
Stab one bug. When joining an estate with a new region, make sure it's also
...
used on first run and not only later.
2010-03-28 23:18:25 +01:00
Diva Canto
efc0916a01
May fix mantis #4613
2010-03-27 22:48:15 -07:00
John Hurliman
05123c6bd5
* Fixed a dictionary value retrieval in GroupsModule
2010-03-26 12:39:22 -07:00
John Hurliman
5a2315c68c
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
...
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
John Hurliman
dd1c1b3bcd
Fixed a backwards null check that was preventing estate owner from being set and a misleading error message (in grid mode it tries to get a user, not create one)
2010-03-26 11:08:14 -07:00
Justin Clark-Casey (justincc)
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
Justin Clark-Casey (justincc)
857918d3b0
minor: some debugging information and spacing changes to group module
2010-03-25 23:53:05 +00:00
Justin Clark-Casey (justincc)
f0703cad2c
add get group by name method to IGroupsModule
2010-03-25 22:47:52 +00:00
Justin Clark-Casey (justincc)
19c659ca99
fix unit tests broken by commit dcf18689b9
...
can't prompt for estate owner in unit tests
2010-03-25 21:46:23 +00: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
dcf18689b9
First stage of the new interactive region creation. This will allow creation
...
of a region and joining it to an existing estate or creating a new estate,
as well as creating an estate owner if in standalone, and assigning estate
owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as
I can't develop or test for either SQLite or MSSQL.
2010-03-23 02:05:56 +00:00
Melanie
70b0e07d1e
Remove the reading of estate_settings.xml and the associated processing of
...
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +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
e0289bb432
Flesh out the new permission method
2010-03-18 19:58:21 +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
b51f40da8f
Removed the unused use_async_when_possible config variable
2010-03-16 12:03:04 -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
Diva Canto
76106e39d9
Restoring LoadPlugin as it was before. Justin's last change made it throw.
2010-03-15 19:34:14 -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
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
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)
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
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
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
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
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
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)
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)
60553e62a3
refactor: begin to move attachments code into a region module
2010-03-05 23:18:47 +00:00
Justin Clark-Casey (justincc)
e906dd3d28
add initial UserGrid service classes as per diva's direction
...
this will initially store home location data instead of the presence service
compiles but not enough to actually test yet
2010-03-05 22:29:51 +00:00
Justin Clark-Casey (justincc)
e39fc95659
Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
...
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
Justin Clark-Casey (justincc)
8bd114b4df
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-05 00:27:24 +00:00
Justin Clark-Casey (justincc)
e07548d703
move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it
2010-03-04 20:08:25 +00:00