3f7050173d
Attempt to make teleports more reliable. This may break redirection on login
2011-05-03 22:33:53 +02:00
61263e2ce3
Some private changes to the prioritizer: 30m steps instead of 10 and disable
...
the broken frontback math. Much better user experience.
2011-05-03 16:58:39 +02:00
aa73f99de6
Revert the CM prioritizer to the core version
2011-05-03 16:44:45 +01:00
af55eda16b
Merge branch 'master' into careminster-presence-refactor
2011-05-03 14:26:18 +01:00
98b84802e4
Changed the defaults, so that it behaves exactly is it has been behaving (no WebFetch cap by default).
2011-05-02 20:19:36 -07:00
ac9697edbe
Fixed: EventQueueGet and other caps were being wrongly deregistered. Also CapabilitiesModule was being instantiated twice (damn Mono.Addins).
2011-05-02 19:45:47 -07:00
6b52c1d6cd
Fix the GetTexture path to /CAPS/GetTexture for now until we have real capabilities.
2011-05-02 16:16:10 -07:00
883f21dd02
WebFetchInventoryDescendents working. Tested with robust.
2011-05-02 14:33:34 -07:00
2d403d5b18
Merge branch 'master' into caps
2011-05-02 11:56:51 -07:00
aba9ffdbd0
Refactored the GetMesh module into a handler and a module, to be the same as GetTexture.
2011-05-02 11:56:40 -07:00
f7d3720126
Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien avatar takes 6secs to transfer between sims on the same machine...
2011-05-02 09:20:08 -07:00
51d0b8b4e9
Oops, forgot this one.
2011-05-02 09:06:21 -07:00
8cc547c277
Turns out that it's a bad idea to let Agent position updates linger for a long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before.
2011-05-02 09:04:34 -07:00
10180760b7
Works!
2011-05-02 08:48:55 -07:00
0995fedcac
AutoBackupModule: Implement per-region settings in Regions.ini.
2011-05-02 04:32:31 -04:00
fffd42f5cb
Merge git://opensimulator.org/git/opensim
2011-05-02 02:23:18 -04:00
2aab033aaa
First pass at fixing justincc's feedback v2 ( http://opensimulator.org/mantis/view.php?id=5440 )
...
Fixing everything here (I think) except the per-region config. That's next.
2011-05-02 02:20:50 -04:00
2d21052fa3
Start to drill down on GetTexture. Read the config and do different things.
2011-05-01 19:09:08 -07:00
f79400e94c
Broke down Caps.cs into a generic Caps object that simply registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps.
...
Renamed a few methods that were misnomers.
Compiles but doesn't work.
2011-05-01 18:22:53 -07:00
275046cf02
Change GetTextureModule.cs to conform to the new IRegion module interface. NOTHING OF THIS WORKS. Compiles.
2011-05-01 12:03:00 -07:00
126d2adeba
Move CapabilitiesModule back to CoreModules. This one belongs there.
2011-05-01 12:02:07 -07:00
f10666c7ba
How this might look like from a configuration perspective. Changes OpenSimDefaults.ini.
2011-05-01 10:07:54 -07:00
8cc9d22b89
Merge branch 'master' into caps
2011-05-01 09:31:26 -07:00
bbe41c75e1
Fixed confusing OSDMap that comes as the response of QueryAccess in the case it fails.
2011-05-01 09:30:23 -07:00
f0bf64b6de
Merge branch 'master' into caps
2011-05-01 09:11:16 -07:00
6b2b036387
Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTexture handler. The region module in Linden space uses it. WARNING: nothing of this works yet, it just compiles.
2011-05-01 09:08:18 -07:00
d4323dd753
Increased Timeout to 30 secs.
2011-04-30 18:08:48 -07:00
91a604d4b6
Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest, because it was _way_ too low and is probably making writes abort in the middle.
2011-04-30 17:40:21 -07:00
56df746133
XXX DEBUGGING!
2011-04-30 16:53:43 -07:00
00e94b0ba8
Check for RegionID instead of RegionHandle. Other minor tweaks
2011-04-30 16:53:11 -07:00
e3c27d8527
Nope, that didn't feel right. Moving all those modules to Linden space.
2011-04-30 13:24:25 -07:00
c062138dad
Moved several cap-based-service-providing modules from where they were into a newly created CoreModules/Caps. Not all.
2011-04-30 12:23:40 -07:00
3e79842312
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
99b35d3ca6
When coming in from a legacy region without fatpacks, start scripts the
...
usual way
2011-04-30 16:20:20 +01:00
8a398ef02d
When coming in from a legacy region without fatpacks, start scripts the
...
usual way
2011-04-30 16:01:54 +02:00
27891fddcf
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-30 14:23:20 +02:00
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
98fe37051a
Set the attachment data on scripted rez to allow toasters to work.
2011-04-30 14:22:46 +02:00
4d5d6222f7
Delaying starting the scripts on TPs and crossings until the agent is root.
2011-04-29 17:09:48 -07:00
412503b216
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-29 15:52:40 -07:00
0d49611f6d
Remove the scripts of the attachments in the departing region and recreate them if fail.
2011-04-29 15:52:06 -07:00
8f14c3f04f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-29 15:49:49 -07:00
d565041e16
Fix crash when [Mesh] section is missing from configuration files
2011-04-29 15:49:10 -07:00
73caa4e94a
Minor correction to yesterday's changes. Make normal prim crossing (no attach) work well again.
2011-04-29 08:42:51 -07:00
e462b926ac
Minor improvement in version checking (Simulation service)
2011-04-29 08:01:44 -07:00
97790075fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-28 20:47:34 -07:00
9892e115cc
Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
2011-04-28 20:19:54 -07:00
5e578c9755
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-28 23:43:42 +01:00
cd7517ccb9
Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.
...
Addresses http://opensimulator.org/mantis/view.php?id=5444
Fix is to stop the asset transaction calling UpdateInventoryItem() since the caller is doing it anyway, which is more correct.
This did not effect scripts.
2011-04-28 22:59:12 +01:00
35f190cc92
One less [Serializable] -- ClientInfo.
2011-04-28 09:06:57 -07:00
549dc5aeb9
Eliminated sAgentCircuitData, a data structure that has been obsolete for quite some time.
2011-04-28 08:58:04 -07:00
7ecf689584
Thank you MrMonkE for a patch that seems to bring the MSSQL data layer up to speed with 0.7.x.
2011-04-28 07:28:29 -07:00
50aa93137d
Fix a bug where physical objects rezzed with an initial velocity by script do not receive this velocity.
...
This is a minimal fix for the 0.7.1 release, pending a non copy/paste solution.
This hopefully addresses http://opensimulator.org/mantis/view.php?id=5457
The bug was introduced in commit 3ba5eeb
2011-04-28 00:59:21 +01:00
e0576b56d3
Thank you Snoopy for a patch that adds some filtering to client versions allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples.
2011-04-27 07:02:37 -07:00
16f6f55f2d
network traffic reduction - decrease update frequency for moving avatars when velocity is unchanged
2011-04-26 16:22:44 -07:00
57efed988c
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-26 23:41:57 +01:00
4ed54dcc01
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-26 23:20:13 +02:00
e713b7e3bb
Try to repair attachments ion the fly if they are detached and reattached.
2011-04-26 23:18:52 +02:00
1505fbb647
Add back the high prioritization for other avatars in the
...
BestAvatarResponsiveness prioritizer.
2011-04-26 08:54:05 -07:00
587aa91e36
Merge git://opensimulator.org/git/opensim
2011-04-26 11:45:38 -04:00
36fef21e52
Merge branch 'master' into queuetest
2011-04-26 08:42:21 -07:00
c82c7e6ed9
Wait for OnOarFileSaved event callback before executing script
...
We want to execute the (optional) user script after I/O is done on the oar.
I wasn't aware that ArchiveRegion is asynchronous -- now I am.
Should fully resolve comment 0018290 at
http://opensimulator.org/mantis/view.php?id=5440
2011-04-26 11:42:06 -04:00
e579a990b4
Removed stale client components: MXP and VWoHTTP.
2011-04-25 18:59:01 -07:00
037373b825
recover from unhandled exception from bad rotation data while processing entity updates in LLClientView.cs
2011-04-25 17:11:54 -07:00
b9bca893ef
Removed debug message in the token bucket code
2011-04-25 16:13:16 -07:00
13f141a4d5
Fix the totals shown by show throttle
2011-04-25 15:36:59 -07:00
a6c53b1ba2
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-25 23:26:37 +01:00
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
b7eda288bf
Merge branch 'master' into queuetest
2011-04-25 15:12:53 -07:00
77ab7ce084
Fixed the transmission of throttles from root agent to child
...
agents. Child throttles are based on the number of child agents
known to the root and at least 1/4 of the throttle given to
the root.
2011-04-25 15:11:29 -07:00
ef4f1fc4ba
Made things consistent between LocalInventoryServiceConnector and RemoteXInventoryServiceConnector on GetFolderContent.
2011-04-25 11:00:48 -07:00
2fefb7adee
Merge branch 'master' into queuetest
2011-04-25 10:55:19 -07:00
024c12abc3
Cleaned up various configuration options. Removed the category throttle
...
limits because the only ones used now are the defaults (which are overwritten
by the client throttles anyway). Updated the default rates to correspond to
about 350kbps.
Also added a configuration to disable adaptive throttle. The default
is the previous behavior (no adaptation).
2011-04-25 10:44:41 -07:00
3a38bd8854
Addresses mantis #5449 -- crashing exception in SendInventoryFolderDetails.
2011-04-25 08:53:48 -07:00
1d7c83c39f
Merge branch 'master' into queuetest
2011-04-25 08:41:21 -07:00
507f0e9ffd
Upped VERSION_NUMBER in master to 0.7.2.
2011-04-24 16:21:01 -07:00
e3c3d626fb
Commented verbose debug message.
2011-04-24 16:14:24 -07:00
d287e0ac68
Merge git://opensimulator.org/git/opensim
2011-04-23 18:33:08 -04:00
440d54a521
AutoBackup: Removed unneeded imports.
2011-04-23 18:32:08 -04:00
082fad6dd2
Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440
2011-04-23 18:29:13 -04:00
e2c6ed236d
Fix a bug looping through the priority queues. This should fix the problem
...
of not all prims being sent without reprioritization.
2011-04-23 12:17:10 -07:00
44e43d9d24
Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.
2011-04-23 00:40:08 +01:00
d5256094d9
print invalid command message to the console, not the log
2011-04-23 00:16:55 +01:00
a3bd769cb3
Added a second immediate queue to be used for the BestAvatar policy
...
and currently used for all of an avatars attachments by the other
policies. Also changed the way items are pulled from the update queues
to bias close objects even more.
2011-04-22 14:55:23 -07:00
08e58e7ca6
Set the initial rate for the adaptive throttle to 160Kpbs
...
or about 15 packets per second.
2011-04-22 14:02:34 -07:00
3534f4492a
Various clean ups. Removed some debugging code. Added a new "show pqueues"
...
command to look at the entity update priority queue. Added a "name" parameter
to show queues, show pqueues and show throttles to look at data for a specific
user.
2011-04-22 14:01:12 -07:00
c411ab54ee
Merge branch 'master' into careminster-presence-refactor
2011-04-22 08:55:12 +01:00
cbe49ed917
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-04-21 19:08:31 -04:00
b8e282324e
fix merge conflicts with OpenSimDefaults.ini
2011-04-21 19:06:54 -04:00
e0002f6b64
some mesh config asthetics
2011-04-21 19:04:41 -04:00
0897647709
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
2011-04-21 15:41:15 -07:00
c5159ad8d0
Add some locking on the child list for the token bucket
...
hiearchy. A few other cosmetic changes.
2011-04-21 15:40:38 -07:00
7f28dd4b31
Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, and Removes in that order.
2011-04-21 15:40:32 -07:00
0c68fbdb1a
Merge branch 'master' into careminster-presence-refactor
2011-04-21 23:06:01 +01:00
398bb2149a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-04-21 23:04:01 +01:00
13d6e05d5a
Implement agent limits
2011-04-21 23:03:38 +01:00
a1dce960d7
Add fix a minor bug
2011-04-21 22:45:46 +02:00
282e116f94
Honor agent limit for region crossings and teleports
2011-04-21 22:34:49 +02:00
5e99d93651
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 15:16:12 -04:00
d9055c8dc3
Group collada meshies settings under [Mesh] in OpensimDefaults.ini
2011-04-21 15:15:24 -04:00
60685c3517
Adjust freeswitch logging to be somewhat less noisy. However, there is still quite a large amount of logging present for debug purposes.
2011-04-21 19:17:38 +01:00
e36cab99fd
minor: small amount of method doc and some commented out odds and ends
2011-04-21 18:45:05 +01:00
44999dce76
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 18:44:04 +01:00
63c1b7e475
Alter uuid gather so that it properly analyzes coalesced objects.
...
This should correct save all the assets required for the items within the coalesced objects in an IAR. This should also correctly gather the items on hypergrid takes.
2011-04-21 18:12:29 +01:00
204b8b7b7e
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-21 16:51:39 +01:00
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
371576d1dd
Merge branch 'master' into queuetest
2011-04-21 08:23:01 -07:00
3640d0204f
Added ability to remove unacked packet from UnackedPacketCollection without an acknowledgement from the network. This prevents RTT and throttles from being updated as they would when an ACK is actually received. Also fixed stats logging for unacked bytes and resent packets in this case.
2011-04-21 01:51:08 -07:00
b5ab33b5e1
bug fix. Now when an unacked update packet is handled through ResendPrimUpdates, it is removed from the UnackedPacketCollection.
2011-04-20 23:08:51 -07:00
7759bda833
Added an "immediate" queue to the priority queue. This is
...
per Melanie's very good suggestion. The immediate queue is
serviced completely before all others, making it a very good
place to put avatar updates & attachments.
Moved the priority queue out of the LLUDP directory and
into the framework. It is now a fairly general utility.
2011-04-20 21:58:49 -07:00
2b737c9cc2
Adds the first pass at an adaptive throttle to slow start new
...
clients. If the sent packets are ack'ed successfully the throttle
will open quickly up to the maximum specified by the client and/or
the sims client throttle.
This still needs a lot of adjustment to get the rates correct.
2011-04-20 16:23:33 -07:00
212326eeb0
fix meshing failure on sculpt maps smaller than 64x64
2011-04-19 22:16:10 -07:00
ccc26f7443
Get Viewer 2 voice working with OpenSim.
...
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
2fa210243b
Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages.
2011-04-19 21:54:26 +01:00
82de87ce99
Converted the property request queue to use the same retransmission
...
mechanism as the entity update queues.
2011-04-19 11:22:04 -07:00
08d8a3e580
Requeue unacknowledged entity updates rather than resend then "as is".
...
Often, by the time the UDPServer realizes that an entity update packet
has not been acknowledged, there is a newer update for the same entity
already queued up or there is a higher priority update that should be
sent first. This patch eliminates 1:1 packet resends for unacked entity
update packets. Insteawd, unacked update packets are decomposed into the
original entity updates and those updates are placed back into the
priority queues based on their new priority but the original update
timestamp. This will generally place them at the head of the line to be
put back on the wire as a new outgoing packet but prevents the resend
queue from filling up with multiple stale updates for the same entity.
This new approach takes advantage of the UDP nature of the Linden protocol
in that the intent of a reliable update packet is that if it goes
unacknowledge, SOMETHING has to happen to get the update to the client.
We are simply making sure that we are resending current object state
rather than stale object state.
Additionally, this patch includes a generalized callback mechanism so
that any caller can specify their own method to call when a packet
expires without being acknowledged. We use this mechanism to requeue
update packets and otherwise use the UDPServer default method of just
putting expired packets in the resend queue.
2011-04-19 08:10:01 -07:00
36c4e94ef7
Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters.
...
Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
2011-04-18 23:22:04 +01:00
f5a041d012
bump default IAR version to 0.2 and 1.1 for the --profile version.
...
There are no changes in this bump, they just signal a point at which the control file comes first in the archive.
2011-04-18 23:00:41 +01:00
6109605038
bump oar version number to 0.6.
...
This commit contains no data changes - the version bump is to establish a version at which the control file must come first in the archive.
2011-04-18 22:42:36 +01:00
6600aa2baf
Add regression test to check that OARs start with the control file.
2011-04-18 22:35:33 +01:00
e00e518692
add test to ensure that an IAR starts with the control file
2011-04-18 22:24:42 +01:00
61619ddefc
refactor: split out the code which actually copies a particular bundle to inventory
2011-04-18 21:59:01 +01:00
71114d4ad1
refactor: rename DeleteToInventory() to CopyToInventory()
...
DeleteToInventory() is misleading - it is the caller that decides whether to delete or not
2011-04-18 21:34:26 +01:00
5a404a9ab1
Fix bug where objects were being coalesced in the wrong positions.
...
This addresses http://opensimulator.org/mantis/view.php?id=5441
The bug was due to a pre-existing mistake in creating the inventory stored position
2011-04-18 21:07:11 +01:00
ccf63a9c63
Merge branch 'master' into careminster-presence-refactor
2011-04-18 21:04:09 +01:00
8533c63d89
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-18 20:36:26 +01:00
d1913f2429
Merge branch 'master' into careminster-presence-refactor
2011-04-18 20:17:29 +01:00
419fc9427e
Provide a configuration setting to control whether multiple taken objects are coalesced to inventory
...
This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini
Default is true.
2011-04-18 20:03:53 +01:00
452ae375f0
Merge branch 'master' into test-merge0418
2011-04-18 11:29:43 -07:00
ec0aa7a90b
Fix up client implementations
2011-04-17 23:17:05 +02:00
dbf52b8cd1
Correct the delegate for classified deletes
2011-04-17 22:54:23 +01:00
0e3580066b
Merge branch 'master' into careminster-presence-refactor
2011-04-17 21:46:27 +01:00
03e725ad87
Mantis #5442 : Add admin_save_heightmap
2011-04-17 21:43:16 +01:00
c02e0e930d
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-17 18:42:06 +02:00
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
2761810531
Fix the cert validation handler so that it will not block other parts of
...
the server doing ssl successfully.
2011-04-17 18:28:06 +02:00
5db8dcb563
Fix agent animation updates
2011-04-17 17:11:33 +02:00
70084c5e3a
More descriptive debug msg for ServiceOSDRequest failures.
2011-04-16 15:29:28 -07:00
3e0e1057ac
Remove the call to remove tokens from the parent. Under heavy load
...
this appears to cause problems with the system timer resolution.
This caused a problem with tokens going into the root throttle as
bursts leading to some starvation.
Also changed EnqueueOutgoing to always queue a packet if there
are already packets in the queue. Ensures consistent ordering
of packet sends.
2011-04-15 16:44:53 -07:00
cd6dce1108
Fixes mantis #5431 -- coalesced objects in HG-enabled regions. Needs more testing to make sure HG inventory isn't broken by this (it shouldn't).
2011-04-15 16:42:40 -07:00
ed74be6599
Make remote admin error messages more helpful on windows.
...
Also, make log messages conform more with convention.
2011-04-15 23:54:30 +01:00
1dba671f45
refactor: separate out code that adds permissions
2011-04-15 23:32:46 +01:00
065d3f42c7
Merge branch 'master' of /home/opensim/lib/develop/BlueWall
2011-04-15 18:28:46 -04:00
fc365f2a31
Thanks Snoopy for a patch that allows setting of perms on items given to new avatars
2011-04-15 18:23:37 -04:00
9c7f14bf36
minor: remove a small amount of code duplication
2011-04-15 23:07:23 +01:00
98c5ed2c79
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-15 22:49:59 +01:00
52d9230392
refactor: split out some rez code into a separate CreateItemForObject() method
2011-04-15 22:47:47 +01:00
37d2b6243b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 21:16:30 -04:00
40bf417da7
Add ColladaMesh switch
2011-04-14 21:15:42 -04:00
66a62678e5
get rid of all traces of the now used mock service infrastructure
2011-04-15 01:37:27 +01:00
631654a38d
remove old code for a mock grid service, which got removed some time back
2011-04-15 01:30:49 +01:00
ba73df39a3
remove any reference to a mock authentication service since it doesn't exist and we don't use it
2011-04-15 01:26:07 +01:00
54e8855819
remove mock asset service for tests in favour of always using the real one
2011-04-15 01:23:26 +01:00
79bd430e08
Remove the mock inventory service for tests and just use the real one all the time with an in-memory data plugin
2011-04-15 01:10:26 +01:00
ad70cddcfc
extend TestLoadCoalesecedItem() to check loaded object ids and positions
2011-04-15 00:56:40 +01:00
a0d80140f2
Make all the objects in a coalescence reappears after being loaded from an IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing.
...
From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug.
It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
2011-04-15 00:42:06 +01:00
821e67fb95
implement stub TestLoadCoalesecedItem(). Doesn't do what it's meant to do yet.
2011-04-14 20:59:52 +01:00
55387542ea
simplify InventoryArchiveTestCase setup
2011-04-14 20:35:00 +01:00
1569148b49
simplify TestSaveItemToIarV0_1()
2011-04-14 20:32:27 +01:00
e439264824
simplify TestRezObject()
2011-04-14 20:23:48 +01:00
c644ab6a2c
Make scene object parts created by the test utils unit sized.
2011-04-14 20:21:44 +01:00
4b05e667cb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-14 20:15:34 +01:00
22b307ea1c
Merge branch 'master' into queuetest
2011-04-14 11:59:25 -07:00
aaf9125869
simplify coalesced object tests by using existing scene object set up utils
...
this change makes it possible to set an absolute position on a group before it is put into a scene.
2011-04-14 17:33:55 +01:00
6ed6b46aad
Comment out the warning if the prioritizer runs without a fully
...
initialized scene presence. Not sure why we are dumping updates
to a client that isn't there yet...
2011-04-13 21:01:51 -07:00
590d20903c
Merge branch 'testmerge' into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
2011-04-13 15:41:17 -07:00
bf91d1b077
remove packet monitoring debugging code
2011-04-13 15:37:25 -07:00
b33aac737a
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-13 15:37:25 -07:00
5e7aba4f88
fixed a couple bugs with the property queues
2011-04-13 15:37:25 -07:00
3fe22126ca
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-13 15:37:25 -07:00
5b89c66c97
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-13 15:37:25 -07:00
c5465414b6
Use common coalesced serialization code for both tests and the InventoryAccessModule.
...
Continue to restore original absolute positions of stored scene objects, though it's possible that these aren't used again
2011-04-13 22:55:26 +01:00
c81f5bfc5c
Adjust the quanterions used in the rez coalsced object tests to get sensible bounding box and offset numbers.
...
Extend test to check position of objects in the rezzed coalescence.
2011-04-13 22:29:12 +01:00
c0fcc430fe
Merge branch 'master' of /home/git/repo/OpenSim into queuetest
2011-04-13 17:03:30 -04:00
68cc5b46fe
refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer.
2011-04-13 21:48:16 +01:00
d8d28c3737
Fix bug where rezzing coalesced objects would give all objects the same name as the item.
...
This now only happens for the first object (which was the item selected last when the coalesce was originally taken)
This matches the expected behaviour of the environment as seen on the Linden Labs grid.
2011-04-13 21:31:45 +01:00
58efd761d1
Add coalesced scene objects class and serializer. This is currently only used by the TestRezCoalescedObject() regression test.
...
This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
2011-04-13 21:17:43 +01:00
dec9c2283b
Add ColladaMesh switch
2011-04-13 16:10:18 -04:00
08fd1d9bbd
factor out some test code into the SetUp()
2011-04-13 18:11:04 +01:00
6613daa82a
Add a regression test for rezzing a single object into a scene from user inventory
2011-04-13 17:46:36 +01:00
90b810c27e
force mesh proxy for simple box prims with path cut
2011-04-12 22:47:30 -07:00
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
16c911dcbb
Implemented terrain save-tile command. Does the opposite of load-tile. For now, only saves to .png.
2011-04-12 19:46:27 -07:00
5c870fce54
Bug fix in object serialization -- sculpt data was wrong.
2011-04-12 19:45:33 -07:00
317617cfda
remove packet monitoring debugging code
2011-04-12 15:55:21 -07:00
80ba3de902
Fixed the update of items in the priority queue to enable both
...
types of property updates to be specified. Not sure if one form
of property update should supercede another. But for now the old
OpenSim behavior is preserved by sending both.
2011-04-12 15:40:57 -07:00
7fa085b3fa
fixed a couple bugs with the property queues
2011-04-12 14:40:57 -07:00
da4a9653a2
minor: remove some mono compiler warnings
2011-04-12 22:33:06 +01:00
b0889ed92a
refactor: simplify bRayEndIsIntersection boolean set from RayEndIsIntersection byte
2011-04-12 22:30:43 +01:00
8e0d2cc43b
If an object is rezzed directly from a prim inventory then give it the rotation it was stored with.
2011-04-12 22:21:46 +01:00
3ba5eeb6c3
Allow a null rotation to be passed in to RezObject so that we can control whether to use the serialized rotation or not. Not used yet.
2011-04-12 22:15:40 +01:00
3afddb9033
Merge branch 'test-select' into queuetest
2011-04-12 12:39:02 -07:00
0e97629ee7
Merge branch 'master' into queuetest
2011-04-12 12:38:47 -07:00
095e602c4a
First pass at moving object property requests into a queue similar
...
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.
This is experimental code.
2011-04-12 12:36:36 -07:00
98d7de22dc
Fix (add) ability to rez objects by dragging them out of another prim's inventory.
...
This should happen if the client supplies a task ID with the RezObject call.
The rez goes through the same code as llRezObject(), so the same perms are applied.
Rotation isn't yet preserved, this should be fixed shortly.
2011-04-12 18:31:41 +01:00
049bce4d00
Fixup the global defaults config parsing code.
2011-04-12 01:14:21 -04:00
42b96a8be0
Merge branch 'master' into careminster-presence-refactor
2011-04-12 00:27:39 +01:00
621d5b58e1
minor: add a bit more method doc to IInventoryService.GetItem()
2011-04-11 23:56:04 +01:00
49d80f5711
Include code to return more information about the NullReferenceException seen in
...
http://opensimulator.org/mantis/view.php?id=5403 prior to doing something about it.
2011-04-11 23:07:56 +01:00
64dc7e9f14
minor: remove now inaccurate comment
2011-04-11 22:35:07 +01:00
e8ecb2898c
minor: remove some mono compiler warnings
2011-04-11 22:33:24 +01:00
3a98fb080a
minor: adjust some spacing and indentation
2011-04-11 22:29:08 +01:00
464fa45ec9
Implimented HTTP_VERIFY_CERT for llHttpRequest
2011-04-11 22:22:11 +01:00
0bd6bc8fba
create "config show" as a region console command synonym for "config get".
...
This is to create greater consistency with all the other show commands.
2011-04-11 21:59:26 +01:00
d6948b15c4
Make it more obvious when it happens that DLL plugin loading fails. Improve exception output on Windows.
2011-04-11 21:51:17 +01:00
95a6ee0a37
Fix NREs harder.
2011-04-11 13:20:46 -04:00
4ad05fb01d
Fix some NREs on certain paths.
2011-04-11 13:12:26 -04:00
4974a1ce69
AutoBackup: Support region-independent settings too.
2011-04-11 12:34:26 -04:00
6e9cdb9ce3
New tokenbucket algorithm. This one provides fair sharing of the queues
...
when client and simulator throttles are set. This algorithm also uses
pre-defined burst rate of 150% of the sustained rate for each of the
throttles.
Removed the "state" queue. The state queue is not a Linden queue and
appeared to be used just to get kill packets sent.
2011-04-11 09:06:28 -07:00
72a24cf023
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/Prioritizer.cs
2011-04-11 08:41:36 -07:00
f778056c7a
Removed some priority queue debugging code
2011-04-11 08:37:43 -07:00
ebc249e3be
Changed the "not in scene" check in the prioritizier to just
...
a warning. There appears to be a race condition on slow logins
that attempts to prioritize before the scene presence is fully
initialized.
2011-04-10 17:02:40 -07:00
19c6d1d569
Split the priority queue class into a seperate file. LLClientView
...
is big enough.
2011-04-10 16:57:02 -07:00
83dc2470f2
Fix a bug in the computation of the RTO. Basically... the RTO (the
...
time to wait to retransmit packets) always maxed out (no retransmissions
for 24 or 48 seconds.
Note that this is going to cause faster (and more) retransmissions. Fix
for dynamic throttling needs to go with this.
2011-04-10 16:57:02 -07:00
0bd06d8ba8
Fixed the prioritizer functions for the new priority queues
2011-04-10 16:57:02 -07:00
77cf9405de
Implements adaptive queue management and fair queueing for
...
improved networking performance.
Reprioritization algorithms need to be ported still. One is
in place.
2011-04-10 16:57:02 -07:00
9c0f3c73b1
Merge git://opensimulator.org/git/opensim
2011-04-10 18:28:54 -04:00
707b6673c9
minor: remove mono compiler warnings
2011-04-09 00:25:00 +01:00
abea0c74c2
Add support for the new display name related functions in LSL. This does not
...
implement the display names functionality as such, but it allows scripts
that are display name aware to function as if the display name were implemented
and set to the avatar name.
2011-04-08 04:19:17 +01:00
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
33dd74e410
Add support for the new display name related functions in LSL. This does not
...
implement the display names functionality as such, but it allows scripts
that are display name aware to function as if the display name were implemented
and set to the avatar name.
2011-04-08 03:50:27 +02:00
d31175060f
trivial whitespace removal to trigger a panda rebuild
2011-04-08 00:42:35 +01:00
0ced677510
Revert master version number to 0.7.1 for now to make merging easier.
2011-04-07 23:22:19 +01:00
9d40c0dcc7
Remove the SQLite legacy adaptor. This is no longer needed now that the main adaptor works on Mac OS X.
...
The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.
2011-04-07 23:20:04 +01:00
a6b1927cff
bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch now exists.
2011-04-06 22:05:07 +01:00
9bc2705f37
Fix bug where on duplication, the root part local id was continually used in populating the local id scene object index instead of each part's local id
2011-04-06 20:52:36 +01:00
8318915d7e
Signal prim count taint if the AbsolutePosition of a scene object changes.
...
This updates prim counts correctly if an object is moved by something other than an avatar (e.g. scripts, region modules)
Create TestMoveOwnerObject() regression test for this case.
2011-04-06 20:48:00 +01:00
63533412f8
Improve previous ILandObject method doc.
...
For test code, take a part name prefix when creating objects, so that these can be more easily identified in the logs
2011-04-06 18:57:50 +01:00
fa202a05e9
Add method doc to some land bitmap methods in ILandObject.
...
Also changes prim count tests to use the correct upper region bounds, though the method actually ignores the overage.
2011-04-06 17:19:31 +01:00
407c2b1823
Merge branch 'master' into careminster-presence-refactor
2011-04-06 09:22:55 +01:00
2497962360
Change some text to make the autoreturn mechanism more obvious, and align with the fact that it's one word rather than two.
2011-04-05 22:25:00 +01:00
acacee98c6
properly refresh object owner list when refresh button is hit on land parcel object tab
2011-04-05 22:15:06 +01:00
0e465da187
remove now unused individual LandData prim counts.
...
However, the calls to the land management module to record prims need to remain, since they were also being used to return owner object lists, etc.
This is probably why prim counts were being done there in the first place.
2011-04-05 21:25:54 +01:00
f030ba8992
replace magic numbers in llGetParcelPrimCount() with constants
2011-04-05 20:39:58 +01:00
dc6ce24443
switch llGetParcelPrimCount() to use new prim counts module
2011-04-05 20:31:52 +01:00
3d400fc663
If an object is selected, then don't include it in owner/group/others prim counts.
...
This fixes the total prim count that the viewer displays when prims are selected - it appears to ignore the total that we pass it and adds up the counts separately.
2011-04-05 18:24:23 +01:00
c1dec225ab
Handle the client's parcel info requests asynchronously rather than synchronously.
...
Handling these synchronously kills the inbound packet loop if many requests are made for remote land and those requests are handled slowly or timeout (timeout is 10s)
This can happen if a user searches for "land for sale" and then clicks many of the parcels in the list (or just presses down arrow to move through every entry).
2011-04-05 17:47:11 +01:00
18e206d2ed
* Bugfix - Compile NullEstateData implement public List<int> IEstateDataStore.GetEstatesByOwner(UUID)
2011-04-04 23:45:28 -04:00
d5e0674213
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-04 20:04:01 -07:00
b2fbadeae8
Updates NullStorage plugin.
...
Thanks MisterBlue...
2011-04-04 20:02:13 -07:00
f58941e89f
Make the "All Estates" option work from the client (this makes chosen changes to all the estates that the user owns).
...
This applies to adding/removing estate users, groups, managers and bans.
This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420
Thanks very much, Snoopy!
2011-04-05 01:30:13 +01:00
8b134f37f2
Fix a bug in the computation of the RTO. Basically... the RTO (the
...
time to wait to retransmit packets) always maxed out (no retransmissions
for 24 or 48 seconds.
Note that this is going to cause faster (and more) retransmissions. Fix
for dynamic throttling needs to go with this.
2011-04-04 14:18:26 -07:00
15c4bbea59
Fixed the prioritizer functions for the new priority queues
2011-04-04 13:19:45 -07:00
6885b7220c
Implements adaptive queue management and fair queueing for
...
improved networking performance.
Reprioritization algorithms need to be ported still. One is
in place.
2011-04-04 11:41:07 -07:00
adb14ad20a
Implement rezzing coalesced objects
2011-04-03 20:32:04 +01:00
a4b3439025
Implement rezzing coalesced objects
2011-04-03 20:26:18 +01:00
b385d4aa03
Implement taking of coalesced objects.
...
WARNING!!!!!
You can TAKE them, but you can't REZ them again. Only the first of the contained
objects will rez, the rest is inaccessible until rezzing them is implemented.
Also, rotations are not explicitly stored. This MAY work. Or not.
2011-04-03 20:24:44 +01:00
e8e940e33e
Make CHANGED_OWNER work for deeding and god-mode in-world change
2011-04-03 14:16:41 +01:00
15e0b55e66
Merge branch 'master' into careminster-presence-refactor
2011-04-03 14:16:28 +01:00
89a65df160
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-03 14:15:29 +01:00
4256693a9e
Make CHANGED_OWNER work for deeding and god-mode in-world change
2011-04-03 13:50:19 +02:00
4f56c732bc
Comment out some startup logging lines to make up for the one I added earlier on.
...
Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy)
2011-04-02 02:29:42 +01:00
7bba0177fe
If land is not group owned (group ID is always UUID.Zero) then don't check if a prim should be added to the group count
2011-04-02 01:53:47 +01:00
8e668abc6d
add test for removing group owned objects
2011-04-02 01:46:06 +01:00
01b399055b
add test for adding group object, factor out initial zero counts test
2011-04-02 01:37:46 +01:00
c13502a5cf
add remove others object prim count test
2011-04-02 01:15:17 +01:00
2c86f6ba7d
refactor: rename m_dummyUserId to m_otherUserId
2011-04-02 01:13:10 +01:00
5b0936d4b5
If the land has no group ownership (it is UUID.Zero) then don't put prims in the group count when they are also not group owned.
...
Also adds simple test for others owned count when an object is added
2011-04-02 01:07:52 +01:00
3a113f9902
A stab at making CHANGED_OWNER work
2011-04-01 22:04:29 +01:00
3053b60143
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-04-01 21:52:04 +01:00
95e524dde1
A stab at making CHANGED_OWNER work
2011-04-01 18:49:53 +02:00
329fa73695
Merge branch 'master' into careminster-presence-refactor
2011-04-01 07:44:43 +01:00
e974fde953
check threat configuration for LSL print()
2011-03-31 22:56:04 -07:00
8c8a0a182e
implement LSL "print()" API function
2011-03-31 21:14:53 -07:00
8f4bf43534
When asked to join region to existing estate, make first estate name the default instead of None
2011-04-01 00:55:05 +01:00
e1ceb461c0
Make default answer for 'do you wish to join region to an existing estate' yes instead of no.
2011-04-01 00:51:10 +01:00
39c610c165
Log which address and port the UDP listener is configured for. This will match that given for InternalAddress in the config (e.g. 0.0.0.0)
...
Can't obtain actually bound address until the UDP socket is used for the first time.
2011-04-01 00:41:52 +01:00
4d0cffa06e
If the prim count gets an object with invalid bounds, don't try to count it.
...
This appears to be the more probable explanation for some failures seen. Either we're counting attachments which are temporarily out of bounds (shouldn't be due to the IsAttachment) check or we're counting scene objects which have out of bounds co-ordinates (seems more likely)
2011-03-31 23:56:26 +01:00
6ae76ede98
suspend check that IAR control file is loaded for now
...
I was mistaken - some previous opensim versions don't save this file first. Will have to bump iar version number and only check iars after the bump
2011-03-31 23:09:06 +01:00
88bd38690a
Remove unused RegionInfo.getInternalEndPointPort() in favour of RegionInfo.InternalEndPoint.Port
2011-03-31 23:03:42 +01:00
efd0c003a3
Put in temporary logging message to find out if scene objects are requesting land objects for co-ordinates outside the region
2011-03-31 22:47:18 +01:00
7bba31e8d9
remove some mono compiler warnings
2011-03-31 22:20:12 +01:00
8022400bd4
Remove unused Datastore parameter from RegionInfo (legacy from early 2008)
2011-03-31 22:16:09 +01:00
83c78029e3
Make the login service's call to the sim time out quicker so we have a
...
chance to try fallback before the client quits
2011-03-31 15:48:42 +02:00
f7ed7fc05d
When a new parcel is created, make sure the prim counts are updated.
...
This is done by tainting the counts where appropriate
2011-03-30 00:42:02 +01:00
8b16f7d976
(re)implement selected prim count.
...
This does not currently count objects that are sat upon (which the viewer ui implies should be included in this count)
2011-03-30 00:13:07 +01:00
f754dedbef
Merge branch 'primcounts'
2011-03-29 23:08:44 +01:00
fe258753a0
disable prim count debug logging temporarily
2011-03-29 23:07:01 +01:00
45548873bd
Fix llGetParcelPrimOwners so that it returns LSL_Strings in the list rather than C# Strings
2011-03-29 09:28:27 -07:00
309eb712a3
Improvement over 2 commits ago: make the hyperlink check understand port 80.
2011-03-28 19:34:55 -07:00
d3771e5366
Added code to load a terrain tile of tiff/jpg format. Previously it only worked for one single region.
2011-03-28 16:48:12 -07:00
2d209d3844
Fix mantis #5413 . WARNING: new config variable in section [GridService] of the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples.
2011-03-28 16:46:04 -07:00
c39b391b6a
Many scripted items use long lists of llSetLinkPrimitiveParams rules to make prims "teleport" or jump large distances. When teleporting to 10,000 meters, this results in 1,000 SetPos calls, which severely rapes the physics and update system. This change modifies this behaviour to only provide one update after all the rules have been executed.
2011-03-28 13:28:59 -07:00
f7276dda02
Flag root prim changes for persistence
2011-03-27 14:20:25 -07:00
a62b435a39
Merge branch 'master' into careminster-presence-refactor
2011-03-27 21:41:54 +01:00
2d2a1acfae
Upgrade terse to full update on root rotation change. Not entirely sure why, but it seems that the terse update causes the first prim to rotate improperly on occasion (only temporary, it's fixed by the full update on deselect, but this will prevent confusion.)
2011-03-27 13:43:32 -07:00
f25749f025
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-03-27 21:22:31 +01:00
553a195493
Fix issues with UpdateRootRotation and also increase efficiency
2011-03-27 13:09:19 -07:00
797128a6ad
Rename some member fields to standard m_ OpenSim code convention
2011-03-26 02:44:46 +00:00
83f48c26d6
add header file
2011-03-26 02:43:41 +00:00
de0730a54c
Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure.
2011-03-26 02:42:50 +00:00
361b3e7ab8
Removing hard-coded plugin loading in favour of direct class instantiation
2011-03-26 02:39:30 +00:00
3f4be42a87
Altering log feedback
2011-03-26 02:28:11 +00:00
e93531e124
Fixing bug that occurs when using web login- the result was not checked
2011-03-26 02:28:11 +00:00
3bc859a834
Making combined auth service re-use the existing auth services instead of duplicating code
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
0e808950fb
InfoFormat > DebugFormat
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
6153c45973
LLLoginHandlers now supports both password & web login
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
af3956348f
Adding a combined auth service, allowing users to login with either web login or password
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
482686daab
WebkeyAuthenticationService is now no longer a stub!
...
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
f2d2470c25
When an object is duplicated, add it to the full/local id SOG indexes as well as Entities
2011-03-26 02:24:32 +00:00
b11e3d33f1
add save of LLClientView I forgot from last commit
2011-03-26 02:20:16 +00:00
541cd3e8c8
move total parcel prim calculations into IPrimCounts instead of doing this in LLClientView
...
need to move selected prim counts from LandData/LMM still
2011-03-26 02:19:28 +00:00
bfd9cc44b4
When an object is duplicated, add the dupe to the uuid/local id indexes as well as the basic entities list.
...
Added a prim counts test to reinforce this - shift-copy was no incrementing prim count. This will sometime become a basic scene test.
New code needs to be refactored so we just call SceneGraph.AddSceneObject(). This will happen in the near future.
With this, basic owner prim counts on a single parcel appear to be working fine (with the same previous existing taint calls as used by the land management module).
More work to do.
2011-03-26 02:05:53 +00:00
3d0e072d50
Merge branch 'master' into primcounts
2011-03-26 00:57:52 +00:00
26d16567e1
Make SceneGraph.ForEachSOG() execute once for each SOG, not once for each prim (e.g. a SOG with 3 prims would have the action executed three times).
...
To do this, a new SceneObjectGroupsByFullID index in SceneGraph which just index's prims by their root part UUID, in order to avoid the inefficiency of filtering existing lists.
Existing callers to SceneGraph.ForEachSOG() did not fail due to the multiple per SOG action executions - they were probably just much less efficient.
Code suggests that no callers expected ForEachSOG() to execute actions on sog multiple times
2011-03-26 00:53:19 +00:00
f30bf429c2
refactor: rename SOG collections in SceneGraph to make it clearer that they are indexing each part's UUID, not just the root part.
2011-03-26 00:42:48 +00:00
cc8897fceb
Add test for PCM taint. This currently fails due to unexpected behaviour of SceneGraph.ForEachSOG(). This will be corrected soon.
...
Also adds lots of temproarily debug logging
2011-03-26 00:34:49 +00:00
d8e1c380e6
minor: make it clearer in the log where we're loading region config files and not the regions themselves
2011-03-25 23:36:58 +00:00
3a55d59b45
in region web loader, print out url that config is being loaded from (this wasn't being done anywhere).
2011-03-25 23:29:06 +00:00
ea72745d43
Log the xml/ini regions config files that opensim loads from, and the regions that it loaded from them
...
This will show up with the lines [REGION LOADER FILE SYSTEM]: Loading config files from ./Regions, etc.
2011-03-25 23:18:47 +00:00
6ae04448f7
Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.
...
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
2011-03-25 23:05:51 +00:00
7f5019b0f2
Add ILandObject.IPrimCounts for the new prim count module.
...
Not functional yet, but tests now act against this object rather than interrogating the module directly
2011-03-25 21:47:54 +00:00
8338b74d3f
Add giving lists of items to another prim
2011-03-25 02:39:17 +01:00
5ef490b5ad
Switching vivox to https for production use
2011-03-25 01:10:41 +01:00
eaa37d15f2
factor out common test setup code in PCM tests
2011-03-23 23:28:23 +00:00
f001aab8aa
extend TestAddOwnerObject() to add a second object
2011-03-23 23:19:15 +00:00
ebbe3afaf1
Add PrimCountModuleTests.TestRemoveOwnerObject().
...
Also adds SceneSetupHelpers methods to easily create sogs with different part UUIDs
2011-03-23 23:14:55 +00:00
d5c7ae5c6b
refactor common sop setup parts into a single method
2011-03-23 22:40:23 +00:00
de88227bc4
refactor: simplify part of AddSceneObject() test setup by moving sog construction into SceneSetupHelpers.CreateSceneObject()
2011-03-23 22:29:27 +00:00
88673c86a4
use a 3 part object for the pcm test rather than a 1 part, for improved test coverage
2011-03-23 22:17:47 +00:00
f1f4985ab6
user a non UUID.Zero user in pcm test to avoid any special treatment of UUID.Zero
2011-03-23 22:14:04 +00:00
654aa7abeb
Extend simple PCM add object test to check all counts
2011-03-23 22:12:20 +00:00
08c3cd6b36
Add method doc to the Get*() methods on PrimCountModule
2011-03-23 22:04:14 +00:00
67cafbd33a
remove a rogue Console.WriteLine() from the last commit.
2011-03-23 21:54:02 +00:00
d011896341
Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to listen for that rather than EventManager.OnParcelPrimCountAdd
...
OnParcelPrimCountAdd had the wrong semantics for the PrimCountModule - it was invoked for every entity in the scene, not just new ones, which would screw up the untainted count.
Extend automated test for this scenario.
2011-03-23 21:53:14 +00:00
b34743e5fe
Add an initial confidence-building TestAddObject() for prim counts.
2011-03-22 23:47:36 +00:00
3dc9b0ef18
Remove a spammy debug
2011-03-23 00:32:19 +01:00
985f78dbf5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-23 00:06:43 +01:00
bbbcb45398
Fudge the group join permissions for god user in god mode. Allows to join
...
every group without an invite.
2011-03-23 00:05:27 +01:00
78a7c6cace
Remove the forced landmark and home poermissions because they are now in the
...
database
2011-03-23 00:02:41 +01:00
edf9f3d630
Raise the position for lures by 2m to prevent the target avatar getting stuck
...
in a prim.
2011-03-23 00:01:41 +01:00
764e8c2a43
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-22 20:33:24 +00:00
c330f89fb1
Add some more fields to Estate settings and make them work.
...
Run alter table estate_settings add column AllowLandmark tinyint not null default 1, add column AllowParcelChanges tinyint not null default 1, add column AllowSetHome tinyint not null default 1;
to make this work.
2011-03-22 10:43:43 +01:00
3cfaf4c225
Adding a helper function lifted from Aurora. Not for core.
2011-03-22 09:29:40 +01:00
a073ca57da
Add a definition for a region flag to omit a region from traffic counting
2011-03-22 09:23:46 +01:00
7acade00b9
On initial setup, include estate and regions names in questions to make it clearer what they relate to.
2011-03-21 23:26:35 +00:00
3382de4d8b
In initial setup, stop a user being able to create a new estate with the same name as an existing estate.
2011-03-21 23:16:57 +00:00
060a53b896
On initial opensim setup, don't ask the user whether they want to join an existing opensim estate when there aren't any. Proceed directly to estate setup instead.
2011-03-21 22:57:20 +00:00
ee7cfc2854
refactor: use EstateDataService property directly instead of loading it into a local variable
2011-03-21 22:47:02 +00:00
2d1f0d224c
minor: slightly adjust previous method doc.
2011-03-21 22:27:16 +00:00
793bfb5a66
add method doc to IEstateDataService and IEstateDataStore interfaces
2011-03-21 22:25:20 +00:00
d3a20a1e92
On initial region registration, if the user chooses the option to make the region part of an existing estate, then list the existing region names.
2011-03-21 21:37:06 +00:00
b70596c15c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-03-21 13:31:22 -07:00
4d4765aa28
Since we've plugged the leak, now increase URLs to 5000 since the limit is being hit in several sims
2011-03-21 13:30:53 -07:00
fb890e543f
Don't send a windlight profile to clients if windlight is not set for
...
that region. This should restore normal day and night cycles for
regions without WL settings.
2011-03-21 08:02:56 +00:00
e4f143fb1c
Merge branch 'master' into careminster-presence-refactor
2011-03-21 07:57:56 +00:00
7b11a83c08
Don't send a windlight profile to clients if windlight is not set for
...
that region. This should restore normal day and night cycles for
regions without WL settings.
2011-03-21 05:52:29 +01:00
1241cc50f1
Revert "Switch Vivox voice module to https"
...
This reverts commit a8096b52cd
2011-03-18 11:25:08 +01:00
a8096b52cd
Switch Vivox voice module to https
2011-03-18 10:59:32 +01:00
a3651eb5d0
Thanks Kevin Cozens for a patch that:
...
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
13aae75ad8
Prevent god users from being stopped logging into a region
2011-03-16 22:43:49 +01:00
aadd0e8d42
minor: bring comment into line with code reality
2011-03-16 00:14:58 +00:00
fdcf910e00
Fix a bug in T015_LargeSceneObjects() where the large scene object was stored 31 times (1 time for each added part) instead of once at the end, even though only the largest 31 prim scene object was retrieved and tested.
...
This considerably speeds up the test, when on sqlite it now only takes 2 seconds rather than 30+
2011-03-14 23:35:03 +00:00
38c3be07b8
when retrieving a sog in database tests, don't bother adding the scene since this isn't used
2011-03-14 23:32:44 +00:00
8509678e48
Add method doc to T015_LargeSceneObjects() and slightly clean up formatting.
...
This test takes a considerable time on SQLite but should remain since it's testing storage and retrieval of a scene object with 31 parts.
2011-03-14 23:26:50 +00:00
48c62eb51b
Add current method output to all persistence level tests so that we can track where we are in the test suite
2011-03-14 23:17:15 +00:00
9885f68f44
When setting media on a prim values, use generic object permissions instead of media permissions.
...
Media permissions are just meant to be checked when we want to know if a user should be shown the navigation bar or allowed to navigate. It should not be checked when we're setting the media up.
This bug was preventing a user from ever setting any more values if they had unchecked the owner settings.
2011-03-14 22:47:14 +00:00
2868f3fc72
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-14 21:56:58 +00:00
cee5e3e264
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 14:51:13 +00:00
3dc877c59f
Merge branch 'master' into careminster-presence-refactor
2011-03-14 14:48:00 +00:00
f54ddd88a2
Up the timeout on slow requests to 3000 to stop console spam. Make sure
...
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
2011-03-14 12:56:50 +01:00
4a5560a86e
Change avatar picker search to work properly when two name parts are used
2011-03-12 13:06:13 +01:00
f6f8d124d1
minor: remove mono compiler warning
2011-03-12 00:52:43 +00:00
f6b638fec9
factor inventory file loading into its own method
2011-03-12 00:49:13 +00:00
c4060e56ef
factor out iar asset load code into its own method
2011-03-12 00:35:40 +00:00
a3c7c04ead
refactor: make boolean load indicators on load iars instance fields
2011-03-12 00:28:23 +00:00
367ed585e0
introduce iar load checks which make sure archive.xml comes first, then inventory nodes, then assets
...
this is necessary for correct loading. "save iar" always saves in this order so there shouldn't be any problems - these checks are to give better feedback to other systems that may construct IARs.
2011-03-12 00:21:52 +00:00
836ab6b0e8
Change how map blocks are encoded to make map search
...
work with viewer 2.
2011-03-10 15:23:46 -08:00
ad1dea5aff
Add test for simple case where creator account with appropriate uuid exists on the target system for an iar load
2011-03-10 22:56:11 +00:00
8d69e68311
refactor: rename test user account fields
2011-03-10 22:52:41 +00:00
9ecb745ed7
factor out common scene setup code in InventoryArchiveTestCase
2011-03-10 22:48:19 +00:00
66d2d35425
extend TestLoadIarV0_1AbsentCreator() to check serialized object CreatorId as well
2011-03-10 22:40:24 +00:00
ce4421497e
re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator()
2011-03-10 22:38:52 +00:00
b821f748ac
For objects loaded from an IAR, make sure the CreatorID points towards the OSP resolved ID if newer CreationData is not present.
...
This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account.
This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see.
This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file).
This is for IAR loading only. Tests updated to check this behaviour.
2011-03-10 21:56:15 +00:00
db2ad62c9b
in AssetHelpers.CreateAsset(), create objects using the 'original' xml format rather than 'xml2'
2011-03-10 19:52:19 +00:00
a151afebe3
When setting up default iar for testing, use iar archiving code rather than constructing the tar manually
2011-03-10 19:40:19 +00:00
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
4dd60b7dce
Change existing users load iar test so that it fulfills it's original intention (i.e. OSPA resolution, which is still active).
...
Will need to write a separate test for the simplest case where creator accounts with appropriate uuids exist on iar load.
2011-03-10 00:19:17 +00:00
549b0ea17c
Split the inventory path testing parts of TestLoadIarV0_1ExistingUsers() into a new test TestLoadIarToInventoryPaths()
2011-03-10 00:06:32 +00:00
fa1996155e
Make the item created in the default test iar an object rather than a script
2011-03-09 23:58:26 +00:00
07f68c8318
minor: change the order of some default iar setup in test case
2011-03-09 23:54:52 +00:00
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
20aeace8d7
Add log messages on teleport failure to better pin down the cause.
2011-03-09 22:03:12 +00:00
ae507bb060
Split out path tests from InventoryArchiveTests. Factor common code into test case parent
2011-03-09 01:53:27 +00:00
2fa8fc5052
remove inventory service preserving code from SceneSetupHelpers too
2011-03-09 01:37:31 +00:00
f375a5e9cb
Simplify SceneSetupHelpers class by removing all code which was originally preserving service instances between tests. This wasn't being used anyway and just leads to hard to diagnose test failures.
2011-03-09 01:31:47 +00:00
8a2360bf81
Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests
2011-03-09 01:21:31 +00:00
743a6b0da5
Make -m shortcut option for --merge on load iar specific. Correct some log message origins.
2011-03-08 22:44:02 +00:00
9923a2ff10
Pull up Assembly of the MySQL classes as a protected property, so that it can be overwritten in subclasses. That way extensions can decide in which assembly migration resources should be looked up. This is just a refactor -- no functional changes whatsoever.
2011-03-08 09:02:29 -08:00
9b345ebf73
factor out SetPartMediaFlags() function in MoapModule.
2011-03-05 02:42:47 +00:00
2e46027c14
Construct test load iar only once and reuse for each test, rather than recreating it every time
2011-03-05 02:34:44 +00:00
9e579a7891
Fold ClearMediaEntry() back into SetMediaEntry()
2011-03-05 02:21:53 +00:00
9f85ee29ac
Change MoapModule.ClearMediaEntry to set TextureEntryFace.MediaFlags back to false
...
Implement test for ClearMediaEntry()
2011-03-05 02:18:03 +00:00
12d5a20094
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-03-04 17:18:49 -08:00
3c0d607f45
Changed order of checks for local regions when processing
...
AgentUpdate messages. Should improve throttles and reprioritization
when an avatar is moving.
2011-03-04 17:17:53 -08:00
8efb01b3df
minor: remove some mono compiler warnings
2011-03-05 01:15:27 +00:00
72cb498fd0
minor: Make MoapModule namespace consistent with other modules
2011-03-05 01:13:59 +00:00
481ca910da
add test for MoapModule.SetMediaUrl()
2011-03-05 01:07:05 +00:00
3c89527b22
Fix bug where llSetPrimMediaParams() reported success but never set the media texture.
...
We weren't setting the TextureEntryFace.MediaFlags = true when a media texture was set directly via a script. This was being done when the viewer was setting them directly.
2011-03-05 00:06:51 +00:00
0719ffa6fa
Change protection from being teleported home to extend to incognito gods.
2011-03-01 23:34:02 +01:00
b82b0b1677
Normalizing comparison to lower case, just in case ppl set their config vars inconsistently. (maybe related to mantis #5386 )
2011-03-01 09:20:50 -08:00
60989521a6
Merge git://opensimulator.org/git/opensim
2011-02-28 15:08:35 -05:00
b3c42e952f
Fix small bug with remove region; update settings docs.
...
Our impl of IRegionModuleBase.RemoveRegion didn't remove the scene from the states map.
2011-02-28 11:54:07 -05:00
018645f9f8
First pass at busy heuristics. Compile-tested only.
2011-02-28 11:45:50 -05:00
a01c44e74d
Be smarter about stopping timers. Cleanup formatting.
...
Use a boolean flag to tell timers that fire after IRegionModuleBase.Close() is called that they should not execute.
Also, I used MonoDevelop's auto-formatting feature to format the code uniformly. No guarantee about variable names though.
2011-02-28 11:04:54 -05:00
cea47491de
Fix a few little things
2011-02-27 19:49:23 +00:00
9b277b372b
Merge branch 'master' into careminster-presence-refactor
2011-02-27 19:47:37 +00:00
11105d38bd
Fix a few little things
2011-02-27 18:55:17 +01:00
34b6904939
First working commit of AutoBackupModule.
...
It seems to do something! Heuristics are still TODO, but this is alpha 1.
2011-02-26 22:09:19 -05:00
d3511ca592
Start the timer. (Could it be that simple?)
2011-02-25 09:03:11 -05:00
cb049aa15f
s/True/true
2011-02-25 08:58:42 -05:00
bb1f03abc6
Make timer auto-respawn.
2011-02-25 08:57:48 -05:00
7fa8ed0c47
Config works, but timer isn't firing. Hmm.
2011-02-25 08:48:02 -05:00
2da9bb3ca2
Try to fix config one more time.
...
Note that the way we specify settings has changed significantly here.
2011-02-25 08:31:10 -05:00
2b04cab1ee
change some log messages from info to debug
2011-02-25 02:15:06 +00:00
0f545abfc1
Make the file expiration defaults the same whether the whole [FLOTSAM ASSET CACHE] section is missing or just the particular config values
2011-02-25 01:31:38 +00:00
939c47ac52
instead of using different default memory expiration depending on whether there is a [FLOTSAM ASSET CACHE] section present at all, use the same default all the time
...
this simplifies the code
2011-02-25 01:25:38 +00:00
beff0ac32f
log actual cache directory for FlotsamAssetCache instead of always logging the default
2011-02-25 01:18:43 +00:00
197cc3883f
Fix bug where having no maximum memory cache timeout would cause the flotsam asset cache to try using Double.MaxValue, which would cause the underlying OpenMetaverse.ExpiringCache to choke.
...
There is probably an underlying bug to fix in ExpiringCache.
2011-02-25 01:16:47 +00:00
2f5394e70d
Fix bug where avatars in other regions would not always show up on the mini-map
2011-02-24 22:33:54 +00:00
9be1d2aef1
Merge branch 'master' into careminster-presence-refactor
2011-02-24 02:37:21 +00:00
db7c758b7f
On a Grid Handler exception, explicitly log the exception message and stack trace so that we get somewhat better diagnostics on windows
2011-02-24 00:55:50 +00:00
1bb0bae78a
Forces the owner of a rezzed object to be the "rezzer" of the
...
object rather than the owner of the inventory item. In theory,
this shouldn't happen unless you are using grid-wide library
for inventory.
2011-02-22 13:30:38 -08:00
5a16fa882c
Parameterizes the view distance used to compute and manage
...
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.
This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.
WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
2011-02-22 13:23:54 -08:00
af22b7cb1a
GetRegion(s)ByName with SQLite behaves like it does with other databases.
...
The in-memory storage of region data that is used by default with SQLite now handles wildcards in region names in the same way as SQL queries do with other databases.
2011-02-22 13:00:45 +01:00
87e9acf714
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-21 04:16:33 +01:00
1a31f7b579
Allow modifying a no mod object through llGiveInventoryItem if the object
...
sets allowed drop. This makes breedables feasible.
2011-02-21 04:14:49 +01:00
efd8d03c59
Prevent giving copies of no copy scripts or transferring no trans scripts
...
through LSL
2011-02-21 04:02:47 +01:00
04dc43f591
Prevent attaching things you don't own from inworld. Simple solution for a
...
complex issue
2011-02-21 04:02:16 +01:00
86decb2aa8
throttle group notices to max of 4 threads at a time
...
...otherwise it can create hundreds of threads and hang
2011-02-20 15:57:57 +00:00
c2658c2f14
More relevant console messages, and maybe fix config problem
2011-02-19 23:14:43 -05:00
7eac0af559
Fix an actual bug in the timer interval calculation (minutes -> msec)
2011-02-19 23:07:54 -05:00
e5c08a553c
More debug messages
2011-02-19 22:55:32 -05:00
3c9bf5c476
Fix config source stuff harder (debug console prints only; no fix yet)
2011-02-19 22:47:05 -05:00
06a4810d21
Fix config source by taking it from Initialize
2011-02-19 22:29:45 -05:00
99e8260282
Add [Modules] option for unconditionally disabling entire module globally (for easy configuration)
2011-02-19 22:08:19 -05:00
dfa63ff031
Let GetNextFile do all the string-building work for SEQUENTIAL.
2011-02-19 20:15:38 -05:00
85654f82a5
First cut of AutoBackupModule; only compile-tested so far
2011-02-19 12:25:04 -05:00
5a78161e74
Restore heartbeat thread
2011-02-19 01:32:20 +01:00
4834b47679
Merge branch 'master' into careminster-presence-refactor
2011-02-19 01:59:49 +00:00
9e47018cfb
Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway
...
This test was non-viable. Keeping inactive T021_TestCrossToNewRegion() around for now since it's still useful for reference purposes in constructing a future working test.
2011-02-19 00:14:13 +00:00
b3a1d8c7f7
Remove unused SceneSetupHelpers.DeleteObjectAsync().
...
Calling async code in automated tests is never a good idea - things become very fragile very quickly
2011-02-19 00:11:08 +00:00
9d668b09ca
remove unused code to share services between scenes in SceneSetupHelpers - this is done differently elsewhere
2011-02-19 00:07:16 +00:00
60fe3d48ee
Put some CapabilitiesModule null checks in Scene
...
Stop tests setting up a capabilities module by default
2011-02-18 23:50:54 +00:00
8249d77991
If GridService.GetNeighbours() could not find the region then log a warning rather than causing a null reference on the normal log line
...
This also extends the TestChildAgentEstablished() test to actually activate the EntityTransferModule, though the test is not yet viable
2011-02-18 23:25:59 +00:00
5c92f62941
minor: remove mono compiler warning
2011-02-18 23:10:46 +00:00
dd9efc1838
extend TestChildAgentEstablished() test slightly to put in EntityTransferModule. Not yet enabled.
2011-02-18 23:05:56 +00:00
eb699df5f6
On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for the last stage of AddRootAgent() instead of SP.MakeRootAgent()
...
Going this extra step doesn't appear to cause any test failures.
This is arguably better for test purposes, though at some stage another method may arise which does just call AddRootAgent().
2011-02-18 22:49:19 +00:00
023f953f39
remove another unused test teardown method
2011-02-18 22:25:45 +00:00
c155f57dbe
remove unused test teardown method
2011-02-18 22:22:51 +00:00
c763edf56d
separate attachment tests out into their own class
2011-02-18 22:20:08 +00:00
60d47836ce
minor: remove mono compiler warning
2011-02-18 22:00:52 +00:00
88da253c94
Add very basic test which invokes the scene update loop once and checks the frame number.
...
This makes Scene.Update() match its original description of performing a single update, which also matches the semantics of SOG and ScenePresence.
2011-02-18 21:54:44 +00:00
e774679f62
minor: add method doc to a few ScenePresence methods
2011-02-18 21:19:16 +00:00
4725221435
Stop the avatar sometimes pausing for more than a second on the border when region crossing.
...
This restores a RemoveFromPhysicalScene() call in ScenePresence.CheckForBorderCrossing() when the agent has been placed in transit.
If we don't remove the agent from the physical scene, then the method continues to be called via ScenePresence.Update()
until the handover of the client between regions is completed. Since this handover can take more than 1000ms (due to the 1000ms
event queue polling response from the server), this results in the avatar pausing on the border for the entire handover period.
2011-02-18 20:54:00 +00:00
c79f79fc84
Add needed dummy to sample money
2011-02-17 18:51:43 +01:00
4f9c3c73ad
Add support for new naming syntax of linked regions to osTeleportAgent and osTeleportOwner.
2011-02-17 13:47:13 +01:00
47a5d8d742
Make osTeleportOwner work in foreign regions by relaxing the restrictions on teleporting an agent.
2011-02-17 13:47:12 +01:00
dd4a503a22
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-16 09:57:43 -08:00
c6f2d66eae
Fix bug introduced by Query Access. The response does not come in a packaged _Result field, it comes as simple OSDMap with 2 fields in it.
...
Also in this commit: comment out irrelevant debug message on AuthService.
2011-02-16 09:57:12 -08:00
25265c964f
Changed console command "alert" and added new command "alert-user".
...
This addresses Mantis #4709 .
Command "alert" always sends a message to everybody; the variant "alert general" has been removed. Sending messages to one user is done with the dedicated command "alert-user".
2011-02-16 18:36:57 +01:00
5c15c5e0ff
Changed default directory for storing map tile images from remote regions.
2011-02-16 18:36:40 +01:00
fc84225038
XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386
2011-02-16 08:18:49 -08:00
918c12c965
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 08:06:11 +00:00
3f93db8371
Streamline ban line processing. Remove remnants of old advisory messages.
...
Centralize ban checking and prepare for adding a "ban and eject" function.
2011-02-16 05:23:30 +01:00
cfce0aa448
Change the QUERYACCESS method to eliminate spurious access denied messages
2011-02-16 05:22:05 +01:00
ccd6e5d071
Merge branch 'master' into careminster-presence-refactor
2011-02-16 02:41:49 +00:00
c75e916ccf
Set filter to send proper rotations for root part
...
This allows the root prim, alone or in a set, to send it's
rotation. This fixes unsitting the avatar on sit-offsest
type teleports where the sit target is in the root prim of
a linkset.
2011-02-13 07:42:53 -08:00
19d3792278
Fix and simplify QBasedComparer.
...
Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order.
2011-02-13 11:11:49 +01:00
c169a62f55
Typo
2011-02-12 18:05:25 -08:00
ba03e2e262
Add the country functions in the careminster API
2011-02-12 20:59:09 +01:00
a8ced66e87
Improved error message on TP failure
2011-02-12 07:28:21 -08:00
9801bf03f8
minor: add comment explaining that GetRegionsByName needs to stay in TeleportAgent for its side effects.
2011-02-12 01:14:12 +00:00
03d82a5a85
Fix bug where "My estate" name was always used even if the user entered a different name on initial setup.
...
Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name.
This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid.
Thanks to Thoneve for the spot on this.
2011-02-12 01:08:56 +00:00
7e21c1eadf
Hack in a crude temporary "estate show" command
...
This will show the estate for each region, along with that estate's id and the estate owner.
This is temporary because the command output might change.
This commit also converts the estate module from the old to the new region module format
2011-02-12 00:46:01 +00:00
26727ee044
refactor: split out estate management commands into separate class
2011-02-11 23:32:38 +00:00
754c244f46
In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row from the data adaptor's Rows list in addition to calling Delete.
...
This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication).
Probably a holdover from copying code from the older legacy adaptor.
Resolves http://opensimulator.org/mantis/view.php?id=5361
2011-02-11 23:06:14 +00:00
413f0c6848
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-11 23:53:52 +01:00
e2762a68b3
Merge branch 'master' into careminster-presence-refactor
2011-02-12 00:42:10 +00:00
8fd58aa00c
add estate name to show regions console command
2011-02-11 22:10:02 +00:00
45382e6f82
Reinstated a couple of null checks related to the previous revert.
2011-02-10 06:26:26 -08:00
89bb5c0941
Revert "Hunting down mantis #5365"
...
This reverts commit ebeef02fef
2011-02-10 06:09:04 -08:00
21715396fa
Put the Ack of UseCircuitCode back to where it used to be. Some ppl are reporting login issues.
2011-02-09 17:45:19 -08:00
f33e51e2ff
Comment instrumentation out. Not needed anymore. Left in comments, in case it is needed again. Mantis #5365
2011-02-09 09:50:26 -08:00
1cd951e5ae
Fix the negative number problem in TokenBucket. mantis #5365
2011-02-09 09:39:53 -08:00
830fee145d
Revert "Brute-force debug -- mantis #5365"
...
This reverts commit 585473aade
2011-02-09 08:35:36 -08:00
1bba9c6300
Revert "Don't build strings unless we're in emergency debugging."
...
This reverts commit ba202ea9b0
2011-02-09 08:35:21 -08:00
477a869fb2
More detection of negatives.
2011-02-09 08:08:57 -08:00
473fac4dc7
Detect negative dripAmounts in TokenBuckets. These negatives result from overflown integer operations. Also added Total to the scene throttles in show throttles.
2011-02-09 08:06:20 -08:00
ba202ea9b0
Don't build strings unless we're in emergency debugging.
2011-02-08 21:09:10 -08:00
585473aade
Brute-force debug -- mantis #5365
2011-02-08 20:12:33 -08:00
117462cba1
Avoid potential race conditions on UseCircuitCode. I artificially made the race condition happen, and got very similar results to those described in mantis #5365 -- no prims/avie sent back.
2011-02-08 17:53:01 -08:00
f431bd20ec
Minor addition to the previous commit
2011-02-08 14:49:50 -08:00
82846afe4b
Minor improvement to previous commit.
2011-02-08 12:37:37 -08:00
f62cb1fcbe
Temp fix (or is it a fox?) for map weirdness
2011-02-08 21:13:31 +01:00
ac7bc78555
Added emergency monitoring of UDP Outgoing packets thread. Just type "emergency-monitoring on/off"
2011-02-08 12:06:14 -08:00
34bd41d186
Comment previous debug
2011-02-08 11:16:38 -08:00
305c755cfb
XFF header again -- debug.
2011-02-08 07:50:01 -08:00
d627122cdc
Mantis #5368 -- exception on WorldMap
2011-02-07 19:44:55 -08:00
d934add021
Thanks Tokeiito for noticing this bug. mantis #5366
2011-02-07 14:49:18 -08:00
8c20f94939
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-07 22:26:09 +01:00
076f2ac8db
Merge branch 'master' into careminster-presence-refactor
2011-02-07 23:07:36 +00:00
6becaf65e1
Fix merge issues
2011-02-07 22:28:59 +00:00
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
2011-02-07 22:08:53 +00:00
e8ba3d3a10
Prevent a nonexistent inventory item from throwing an exception
2011-02-07 22:25:43 +01:00
ebeef02fef
Hunting down mantis #5365
...
Revert "refactor: remove redundant null checks"
This reverts commit 6e58996b4d
2011-02-07 07:45:03 -08:00
98ea78fc77
New command: show pending-objects
2011-02-06 19:39:29 -08:00
2c7e87c45b
Better output for show neighbours
2011-02-06 07:51:20 -08:00
3411d4867d
Honor check of m_Enabled in WorldViewModule.
2011-02-05 19:40:55 -08:00
cc81d924ca
Fixed Caps handlers leak
2011-02-05 19:34:02 -08:00
30fa5ad1e2
One more diagnosis command:
...
show caps
2011-02-05 19:21:12 -08:00
b20ab1063f
Added a couple of console commands to help diagnose issues:
...
show circuits: shows the lists of agent circuit data
show http-handlers: shows the currently registered http handlers
2011-02-05 17:57:30 -08:00
3a2a48a8ca
Add sane packing of ServiceURLs -- OSDMap. The old way (OSDArray) is still supported for backwards compatibility, but will be removed in the future.
2011-02-05 08:20:13 -08:00
67555994ad
Amend to yesterday's deletions: forgot to delete the RemoteInventory module in th addin.xml file.
2011-02-05 07:55:54 -08:00
f78831ec98
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-02-05 04:25:14 +00:00
4e0b0f0f4c
Fix a typo in the QUERYACCESS method name
2011-02-05 04:24:43 +00:00
632babf8fb
Added an additional debug message, and removed a bunch of files that weren't being used anymore -- the old RemotsInventory connectors stuff.
2011-02-04 19:19:38 -08:00
f5a3eb9fd5
Added a config var to HGInventoryAccessModule called OutboundPermission that controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things...
2011-02-04 17:05:45 -08:00
cdd64bb8f5
For now, reinstate the call to World.GridService.GetRegionsByName() commented out in 933f47e
...
Even though we don't use the results, just getting the regions may have side effects in making hypergrid links available for the later World.RequestTeleportLocation()
2011-02-05 00:15:25 +00:00
1ffd70cef7
minor: remove some mono compiler warnings
2011-02-04 23:20:10 +00:00
5b7a5a5b8b
Add position to IM sent from llInstantMessage(), to better fulfill client expectations
2011-02-04 23:14:21 +00:00
a51005aacd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 23:08:27 +00:00
722f0ba18c
Put something in the ImprovedInstantMessage.BinaryBucket for llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with this).
...
We're putting in a string of format "<region name><x pos floor int><y pos floor int><z pos floor int> which appears to be the expected value.
This resolves http://opensimulator.org/mantis/view.php?id=5356
2011-02-04 23:07:47 +00:00
bb69a40fbb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 14:22:17 -08:00
7a6e1fa4cf
Convert SimianMaptile refresh time from ms to seconds. Too many 0's
...
in the config file.
2011-02-04 14:21:18 -08:00
bc2e254b55
minor: fix indentation, spacing on commit 3585130
...
this previous commit tries to look up the texture by name first before just using the uuid.
this allows correct resolution of inventory textures which have uuids as names.
2011-02-04 21:55:22 +00:00
3585130ac8
SetTexture_fix
2011-02-04 21:52:06 +00:00
456cdee5ce
minor: correct a log spelling mistake that was pointed out to me
2011-02-04 21:42:45 +00:00
2ddec29c61
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-02-04 21:15:41 +00:00
144f367863
Bug fixed on map search for HG. Affected queries that had a region name at the end.
2011-02-04 12:57:22 -08:00
034327b51f
Send object date to viewer in microseconds (Fixes mantis bug #3990 )
2011-02-04 20:55:41 +00:00
1613d89383
minor: Correct misspelling of neighbour in log messages.
...
Thanks Fly-Man-
2011-02-04 20:51:51 +00:00
511b12db6b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-02-04 17:32:31 +00:00
b6dda231f2
Corrections for Avatar Auto-pilot target; add llStopMoveToTarget() for Avatar-attached.
2011-02-04 17:31:52 +00:00
ba8826d2b8
Fix "set log level" to once again display current log level if it's not given a parameter
...
This addresses http://opensimulator.org/mantis/view.php?id=5345
2011-02-04 17:11:35 +00:00
9a9c9644ac
Repair x-query-string
2011-02-03 17:25:55 -08:00
cf24069227
Change UpdateAgent (for changes in agent position) to be sent
...
once to each simulator rather than once to each region. This
should help with some of the delays caused by multiple outstanding
requests to a single service point.
2011-02-03 12:43:46 -08:00
8fdc810a23
Addresses mantis #5360 : CreatorData was being written as long as it wasn't null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information.
2011-02-03 04:07:36 -08:00
595891409c
Add another flag
2011-02-02 21:45:37 +01:00
4f7cf491e6
Comment out texture CAPS 'texture not found' message for now
2011-02-02 20:02:10 +00:00
2413e9eb3f
Record number of resent packets in LindenUDP stack and display in stats report
2011-02-02 20:00:50 +00:00
2344150b6e
Stop double counting dequeued packets for packets sent number
...
This is already being incremented in LLUDPServer.SendPacketFinal for every packet
2011-02-02 19:39:33 +00:00
722ae4f031
Add a missing constand and fix ToDoubleList to not eat the last memeber
2011-02-02 20:22:03 +01:00
4a56038d11
Change the timeout on WebUtil to 20s to help make more tps succeed
2011-02-02 03:28:47 +01:00
ba39d9f0e6
Squash a nullref
2011-02-02 03:10:39 +01:00
e5ef993f2b
Fix cm/15627 : Don't block the entire URL on duplicate requests, just that particular request!
2011-01-31 18:01:53 -08:00
0898be5750
Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership() so that it returns null if the user isn't a member of the group.
...
This matches the behaviour of the same method for Flotsam Groups. This is the behaviour assumed by existing code.
Method doc also added to IGroupsServicesConnector to the make the contract clear.
2011-01-31 22:54:36 +00:00
35d29ef3e3
If llHTTPRequest results in an error, still attempt to get the response text. If we can't (which implies the server is unreachable), return the StatusDescription as before.
2011-01-29 19:38:05 -08:00
a2d51f0ff4
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-29 12:46:47 -08:00
188bdfc878
Ignore duplicate llHTTPResponse calls to the same request. Prevents response corruption. Only the first llHTTPResponse call is obeyed, akin to SL.
2011-01-29 12:45:53 -08:00
c14acf8a06
Adapt to CM
2011-01-29 04:51:11 +00:00
24a768a99b
Merge branch 'master' into careminster-presence-refactor
2011-01-29 04:47:32 +00:00
8f008f394d
Flash out the prim count module
2011-01-29 04:27:20 +00:00
e7d5ff9bd2
Create the structure of classes and interfaces to replace the cruft that
...
is in the land management module today
2011-01-29 02:24:27 +00:00
87ed39c953
Significantly increase the total number of URL's available. In second life, the limit is 15,000 URL's (one per prim), so i'd hope we can manage 1k.
2011-01-28 16:51:35 -08:00
0936455725
Adding the prim count module skeleton
2011-01-28 23:44:17 +00:00
38bfdb0c9d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 23:22:16 +00:00
5942385d0e
Add the prim count interfaces
2011-01-28 23:21:41 +00:00
933f47e89d
Comment out unused call to GridService in TeleportAgent()
2011-01-28 22:59:07 +00:00
a4acf485d7
minor: don't bother reparsing the sources for includes if ReadConfig() was unsuccessful
2011-01-28 22:50:49 +00:00
1fcb919798
If a non-globbed included file from config cannot be found then warn the user
2011-01-28 22:46:29 +00:00
ab1ec3c3cc
minor: remove a few mono compiler warnings
2011-01-28 21:51:25 +00:00
13d4fedf7a
Fix a discrepancy vs. SL with parsing x-query-string
2011-01-28 13:45:27 -08:00
a0380af18f
Display supported file extensions/formats in "terrain load help" (Mantis #5349 )
2011-01-28 21:24:05 +00:00
9798b044fe
Added loading and saving of terrain files using Terragen format (Mantis #1564 )
...
Terrain files can now be loaded and saved using the Terragen (.ter) format.
Selection of the terrain file loader to use is now based on the extension
of the filename being loaded and the data is loaded using a memory stream
instead of writing it to a file and then loading it from the file.
2011-01-28 21:19:53 +00:00
ffbfc14689
Make llRequestAgentData shout an error instead of crashing the script when an invalid UUID is passed to it.
2011-01-28 09:55:46 -08:00
ab48caad08
Make the new style stuff compatible with the older revision
2011-01-28 05:25:53 +00:00
188d86998d
Fix up QueryAccess to also check parcels
2011-01-28 04:09:04 +00:00
d91ee131b9
Make the new style stuff compatible with the older revision
2011-01-28 04:31:21 +01:00
3bce53b6e6
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 04:05:49 +01:00
9abaac4d60
Correct chat source location for Av seated on daughter prim.
2011-01-28 04:35:43 +00:00
0ea8046545
Change the way ban lines are handled. Remove a lot of useless stuff designed
...
to physically move the avatar and instead just re-set the position. Ban lines
now work fully.
2011-01-28 04:04:30 +01:00
d90b0c53ec
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 02:38:14 +00:00
3834000778
Change the way ban lines work
2011-01-28 03:35:59 +01:00
80bf95b7b4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-28 02:34:45 +00:00
5a0cb7d37e
Thank you, Goetz, for a patch to fix prim count display in cut regions.
2011-01-28 02:34:07 +00:00
657c14c5db
Fix up QueryAccess to also check parcels
2011-01-28 03:07:25 +01:00
566eff17de
Comment a very spammy debug message that was being output directly to console.
...
My last fox that makes bumping into sim borders/bans work makes this spam
endlessly.
2011-01-28 01:46:30 +01:00
57bf5d9b2a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-28 02:37:59 +00:00
3f200da878
Merge branch 'master' into careminster-presence-refactor
2011-01-28 02:36:20 +00:00
7492131bb6
Fix bumping into sim borders and check estate bans for walking crossings
2011-01-28 01:37:37 +01:00
f9ea5e69c5
Refactor: Break out LoadObjects() and LoadParcels() from a longer method
2011-01-27 21:07:21 +00:00
19e4473a97
Put confirmation on "land clear" command to avoid nasty accidents
2011-01-27 20:57:59 +00:00
3435816541
Merge branch 'master' into careminster-presence-refactor
2011-01-27 20:54:02 +00:00
be3685b1a2
When an oar is loaded, do not create a default parcel before loading the parcels from the OAR.
...
The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one.
Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
2011-01-27 20:36:50 +00:00
42c0dbf49a
Show local IDs in "land show" output.
...
Also properly insert region name in "land clear" command
2011-01-27 20:11:30 +00:00
ab9a0f2f1d
Add "land clear" command
...
This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
2011-01-27 19:37:20 +00:00
5a26dc2743
Fix OAR parcel loading so that old parcels are replaced by the new instead of merged.
...
The --merge switch will still merge the old and new land parcelling.
2011-01-27 18:48:48 +00:00
e33cb3db93
remove unused CreateBaseLand()
2011-01-27 16:50:41 +00:00
b0f641fa15
Make it work
2011-01-27 06:41:07 +00:00
b13eac9996
Make the estate setting "Allow direct teleport" override the constraint
...
of local tepeports to landing points like it is meant to
2011-01-27 07:07:33 +01:00
2a9e712cb4
Let gods TP in wherever they like while in god mode
2011-01-27 07:03:43 +01:00
8568c6a7c0
Implement "Cannot teleport closer to destination" message
2011-01-27 06:57:54 +01:00
1143e022b4
Make landing points work on local teleports. Constrain owners and gods to
...
landing points when coming from off sim (matches agni) to prevent landing
in floors or other prims.
2011-01-27 06:45:53 +01:00
17801bd78b
Add a TeleportFlags member to SP so we can tell how we got there.
2011-01-27 05:33:46 +00:00
adb341e32f
Also set Godlike flag. Might be useful
2011-01-27 05:33:01 +00:00
61b67b2ead
Add TeleportFlags.ViaRegionID to the flags sent on login when the region
...
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 05:32:54 +00:00
eca82d90c2
Change the way landing points are honored
2011-01-27 06:04:56 +01:00
d894007920
Make it work
2011-01-27 05:46:31 +01:00
4cc8d84281
Fix build break
2011-01-27 05:30:39 +00:00
42c22f41dd
Merge branch 'master' into careminster-presence-refactor
2011-01-27 05:18:28 +00:00
c43b892f3a
Add a TeleportFlags member to SP so we can tell how we got there.
2011-01-27 04:14:41 +01:00
1f19bd5f90
Also set Godlike flag. Might be useful
2011-01-27 03:54:41 +01:00
3b8b606eeb
Add TeleportFlags.ViaRegionID to the flags sent on login when the region
...
was entered by hand to determine whether or not to honor the landing
point
2011-01-27 03:49:32 +01:00
0e1d28a862
Clear user account cache before checking flags on login. This will make AV
...
and other bannable flags work in this case.
2011-01-27 03:05:33 +01:00
dd1980c24c
Add an interface for a region's user account cache
2011-01-27 02:58:14 +01:00
307a2c61ef
Fix merge artifacts
2011-01-27 02:43:52 +01:00
3321f9d745
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-27 02:29:10 +01:00
11c742a5a8
Make bans work for teleport. Now teleport will complete block if the user
...
is not allowed on the estate. If the user is allowed on no parcel, the
teleport will also be blocked. If the user is allowed on a parcel, but
not the desired one, the user will be shifted to the closest allowed
location.
2011-01-27 02:16:41 +01:00
31fb448cfc
Mostly revert the last commit with the aim of searching for a better solution
2011-01-26 17:06:17 -08:00
6b27587bc7
Add a "useCached" parameter to GetUserAccount. Add a function to Scene to get the user flags. It has to be here due to access restrictions :/
2011-01-26 16:25:08 -08:00
3ecf712e4d
Add userFlags check to isBanned. This checks bans against DenyAnonymous and DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on .
2011-01-26 14:20:39 -08:00
2bab8e5538
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-26 13:35:21 -08:00
240c0eaf1d
Remove the RestorePresences functions (which don't seem to be doing
...
anything) and clean up the code in AddNewClient (so Appearance only
gets assigned once, not three times).
2011-01-26 13:33:34 -08:00
8eb2789ae1
Add some comments on ILandObject.StartPoint and EndPoint
2011-01-26 21:19:22 +00:00
a0469daf75
Implement command "land show". This shows all the parcels on the currently selected region/s
...
This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
2011-01-26 21:12:41 +00:00
04c62c4959
Revert my previous SHA1 commit in favour of a better implementation
2011-01-26 12:54:12 -08:00
63dcd44e87
Provide an SL compatible llMD5String function across all platforms
2011-01-26 12:47:43 -08:00
4d3696d658
Make llSHA1Hash SL compatible when using characters like the euro symbol (€)
2011-01-26 12:40:33 -08:00
c4727645b8
Removed a few more spurious appearance saves. When an avatar
...
enters a region the attachments module tries to update the
appearance with attachments that are already part of the appearance.
Just added a check to only save if the attachments weren't there
before.
2011-01-25 14:23:58 -08:00
3c075aaf46
Reproduce a corner case behavior for llListReplaceList
2011-01-25 16:19:29 +01:00
b91c99b596
Fix script data not being reset as it should be
2011-01-24 03:07:01 +00:00
aa6c097cca
Complete country support
2011-01-24 03:08:00 +01:00
649d9ef934
Fix script data not being reset as it should be
2011-01-24 02:20:54 +01:00
dbbf43663e
Add a careminster API to scripting again
2011-01-24 02:16:28 +01:00
105deab601
Merge branch 'master' into careminster-presence-refactor
2011-01-23 23:29:25 +00:00
cc39d0bf4e
Fixes mantis #5343
2011-01-23 14:47:58 -08:00
17787e7c87
Completely nixing flags from the client causes wearables to break. Fix it
...
so we let the lowest byte through.
2011-01-22 19:00:46 +01:00
a32381cb9b
stop extremely old region serialization commands from appearing in the console
...
as far as I know these are unused and unsupported. Please re-enable if this is not the case. This does not effect save-xml[2]/load-xml[2]
2011-01-22 00:27:34 +00:00
cb14e1d272
Update the "config get <section> <key>" command to "config get [<section>] [<key>]"
...
The config get command shows a current config value on the console.
Now, if <key> is omitted then all the values for the given section are printed.
If <section> is ommitted then all sections and all keys are printed.
Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues
2011-01-21 23:59:55 +00:00
41105948bd
remove some mono compiler warnings
2011-01-21 23:19:52 +00:00
e44ceaaea3
make "show info" and "show version" show the same version text
2011-01-21 23:07:19 +00:00
43f948d691
add current console log level to "show info"
2011-01-21 23:05:53 +00:00
bf5ec8cb88
remove some mono compiler warnings and unnecessary dictionary instantiations
2011-01-21 22:51:52 +00:00
5f3f7c3405
minor: remove unnecessary newline from "show throttles" information
2011-01-21 22:48:49 +00:00
6ef7ea454c
Remove old 2 year unused linden stack region module shell
2011-01-21 22:48:04 +00:00
9971fdbcd5
properly format "show throttles" table
2011-01-21 22:31:46 +00:00
38debbc59f
crudely refactor table generation code for "show queues" and "show throttles"
2011-01-21 00:56:37 +00:00
c383dbd06d
implement "show throttles" command for showing current agent throttles and the server settings.
...
This is in a very crude state, currently.
The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules
OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved).
This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
2011-01-21 00:38:16 +00:00
58eb6b5fa3
minor: help text adjustment for "show queues"
2011-01-20 23:22:45 +00:00
df740d8e5c
remove reference to CoreModules from ClientStack.LindenUDP
...
client stack uses modules in the same way that scene does - through their interfaces
2011-01-20 23:21:25 +00:00
1baf63dbae
Move "show queues" command out of OpenSim.cs and into a separate module.
2011-01-20 22:57:12 +00:00
f50780f4c2
remove unimplemented "show assets" command
2011-01-20 21:56:48 +00:00
b0aebc6f3d
minor: make "show info" help slightly clearer
2011-01-20 21:41:48 +00:00
b92673c1c9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-20 06:52:10 +00:00
bfa5b7850c
Fix drift of static prim.
2011-01-20 06:51:50 +00:00
d3dca7d25a
For now, comment out logging messages about IM sending, since these cause high spam for large group messaging
2011-01-19 01:50:02 +00:00
28fda1cab6
with mic's permission, reduce appearance, baked texture logging verbosity for now
2011-01-19 01:41:32 +00:00
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
97c0430093
Downgrade and comment out some other caps messages for now
2011-01-19 01:10:09 +00:00
7f000ea88e
Correct "show queues" to show queued packet numbers for each client instead of bytes.
...
Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content. But raw packet numbers are.
2011-01-19 00:33:25 +00:00
f3968c4959
Merge branch 'master' into careminster-presence-refactor
2011-01-18 06:18:10 +00:00
9f7b37b37c
Fix build break
2011-01-18 01:48:37 +00:00
06e225bc0b
Also fix MySQLXInventoryData
2011-01-18 01:31:14 +00:00
6306578fcf
Merge branch 'master' into careminster-presence-refactor
2011-01-18 01:28:50 +00:00
ac16a49ca0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-18 01:27:11 +00:00
f73c90c633
Put the 'new' back to avoid a warning. Yes, we want to hide it.
2011-01-17 17:52:03 -08:00
a07375a7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 17:41:06 -08:00
c98d1cffe2
Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether.
2011-01-17 17:40:48 -08:00
75644e0f6e
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 01:26:42 +00:00
31144a62b3
Change gesture activation to not quash any other flags
2011-01-18 01:26:37 +00:00
624bf23abb
force objectId to UUID.Zero for non-overridden animations in AvatarAnimation packet
2011-01-17 16:39:53 -08:00
3083c517a0
minor: resolve some mono compiler warnings
2011-01-18 00:29:10 +00:00
c544f0d0c5
Prune some of the excess logging for client logins.
...
Didn't touch the appearance related stuff.
2011-01-18 00:25:24 +00:00
523628dca3
minor: remove mono compiler warnings
2011-01-18 00:14:58 +00:00
8233ef25ba
Reduce amount of debug lopgging put out by some simiangrid connectors. Please re-enable if needed.
2011-01-18 00:10:34 +00:00
6e58996b4d
refactor: remove redundant null checks
2011-01-17 23:57:50 +00:00
4f8ba53f86
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 00:55:08 +01:00
81552099d6
Fix UnackedBytes client stack statistic as seen in "show queues"
...
Bytes were being wrongly added again on a resend
2011-01-17 23:45:25 +00:00
37837850d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 13:12:46 -08:00
aecaadd3bd
objectId in AvatarAnimation packet should be UUID.Zero for non-overridden animations
2011-01-17 13:10:09 -08:00
4bcee1dfb4
Revert "DEBUG DEBUG DEBUG"
...
This reverts commit 59c2cd04ba
2011-01-17 13:07:02 -08:00
59c2cd04ba
DEBUG DEBUG DEBUG
2011-01-17 12:35:19 -08:00
ddb4de139c
Change gesture activation to not quash any other flags
2011-01-17 21:22:32 +01:00
5e35651efc
Protect World Map module, RequestMapItemsAsync, from badly formed URLs.
2011-01-17 11:45:13 -08:00
479d72ac97
Account for some component along the way lower-casing the HTTP header keys. (XFF header issue)
2011-01-17 11:37:39 -08:00
0aeb8981b2
Brute force debug for XFF issue
2011-01-17 11:19:20 -08:00
66f99ae267
More debug messages to help track the XFF header problem.
2011-01-17 11:03:46 -08:00
76f39d326e
Add a new ViewObjectInventory permission to decouple viewing from
...
+MOD status
2011-01-14 18:26:41 +01:00
30320077a2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 03:20:47 +00:00
a30bbcbb64
Temporarily reinstate prim counting in the update loop to make the production
...
systems run
2011-01-14 04:09:02 +01:00
fe2d9be0cf
Implement nonlocal god kicks and freezes
2011-01-14 03:35:45 +01:00
139e84c0b2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 01:01:02 +01:00
ddb5f4e44a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:01:50 +00:00
3fc5b6a8ec
Merge branch 'master' into careminster-presence-refactor
2011-01-13 19:53:44 +00:00
69c8cc787f
Make FireAndForgetWrapper a singleton class
...
Made FireAndForgetWrapper a singleton class to allow us to drop
dependancy on the BclExtras35 library. BclExtras is broken in
Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
4eefdd5549
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:21:53 +01:00
69666be28c
Implement kicking, freezing and unfreezing users in the same sim via
...
profile god buttons.
2011-01-13 16:05:17 +01:00
c0134710f7
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 04:48:32 +00:00
d92069fb8b
Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M.
2011-01-13 04:44:04 +00:00
e4bb8dc385
Guard against invalid light color specifiers from the database
2011-01-13 00:19:39 +01:00
705f4e1e4b
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 21:46:49 +00:00
914e4b319e
Fix direct item give permissions
2011-01-12 21:39:13 +00:00
f75a3ee762
Use ToString() rather than a cast (more robust)
2011-01-12 21:25:51 +00:00
7cfe17b5b3
Partial permissions fix for boxed items.
2011-01-12 21:25:38 +00:00
dd154f7403
Fix god mode perms adjustment
2011-01-12 21:21:34 +00:00
f59b55d930
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 17:40:21 +01:00
7f99a8c900
Fix direct item give permissions
2011-01-12 16:20:38 +01:00
d8fd777e13
Use ToString() rather than a cast (more robust)
2011-01-11 14:59:55 +01:00
2c6a410e90
Partial permissions fix for boxed items.
2011-01-10 22:02:22 +01:00
72048169c0
Taint SOGs the right way
2011-01-10 22:02:09 +01:00
e80bcc0049
Improved debug messages to track what is going on with the XFF header
2011-01-09 16:52:41 -08:00
0fabe0e5a5
Added more debug messages under the -verbose option.
2011-01-08 16:33:33 -08:00
35a2961ccd
Added a -v|verbose option to save iar.
2011-01-08 16:17:00 -08:00
9d9a170571
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-08 15:50:25 -08:00
eab0951a59
Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
...
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
2011-01-08 15:49:51 -08:00
ec22560045
Merge branch 'cmickeyb'
2011-01-08 13:33:52 -08:00
df7fb207a8
Moved the map tile processing used by the Simian Grid
...
Frontend into a separate region module. Configuration
settings added to the defaults ini file. Others may find
this useful for pushing map tiles to a separate server.
2011-01-08 13:33:07 -08:00
c271bbcc8a
Preserve the script running flag when copying an object.
2011-01-08 16:44:28 +01:00
1ab9cd0997
Fix a couple of security issues
2011-01-08 13:51:34 +01:00
a1c5de0f94
Try to fix a IAR problem reported by nebadon, where save iar seems stuck forever.
2011-01-07 12:32:47 -08:00
02e661f8dd
Minor additional debug message.
2011-01-07 11:39:22 -08:00
8c0e156b4d
Make HG map search consistent with new syntax for link-region, i.e. http://foo.org . Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http.
2011-01-07 11:38:54 -08:00
c18bcf3d8d
A bit more frugal on the caller side of closing agents, now that the receiving end is async. No need for so much concurrency.
2011-01-07 10:25:49 -08:00
52f88f5739
Spawn a threadlet upon receiving requests to close agents. The operation may take too long, and we don't need to keep the caller waiting.
2011-01-07 10:04:39 -08:00
32a3f330ed
Canonicalize URL endings for the UserAgentServiceConnector.
2011-01-06 17:42:16 -08:00
fda56618e1
Deal with possibly un-initialized scripts in object transfers. Mantis #5310
2011-01-06 16:17:43 -08:00
81587466e7
Map search: changed the flag sent to the client. It was 2 (???), now it's 0. This makes HG map tiles work on map search -- a longstanding annoyance. My map search tests were all ok, but since I don't understand these flag values, this may break something related to map search.
2011-01-06 12:53:54 -08:00
21dedb573b
HG map tile fetch: handle cached images appropriately.
2011-01-06 12:48:28 -08:00
5b43f9cac4
HG bug fix. Must wait for client's UDP contact before getting scene presence.
2011-01-06 12:47:13 -08:00
de4eaab584
Merge branch 'master' into careminster-presence-refactor
2011-01-06 19:08:15 +00:00
d1b6b4d288
Fix god mode perms adjustment
2011-01-06 19:12:25 +01:00
d3ebf64369
Merge branch 'master' into cmickeyb
2011-01-05 15:01:53 -08:00
0b44e99730
comment out a couple simian debug messages
2011-01-05 14:51:11 -08:00
984a9b4085
Added more performance checks to the HTTP server. Each request
...
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
17ebe8fb77
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-05 07:14:45 -08:00
0c165bc421
Commented a verbose Debug message in LLUDPServer that got uncommented at some point.
2011-01-05 07:14:09 -08:00
4ac58093bf
Make the default for the very verbose XMLRPC groups debug setting false rather than true!
2011-01-04 23:23:42 +00:00
ba7a227763
Revise Materials properties; Fix Double-Click Autopilot; Allow non-script sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
2011-01-04 21:36:09 +00:00
fbde9b1136
Note to self: try to make only 3 things at the same time.
2011-01-04 11:33:15 -08:00
db55859125
Guard against null Animator.
2011-01-04 11:30:08 -08:00
6a5d52b4c8
removed the early return on agentupdates, this was debugging code
2011-01-04 09:12:32 -08:00
e0da281e3d
Cleaned up debugging messages in the WebRequest handlers
2011-01-03 17:16:22 -08:00
d3987024d7
Merge branch 'master' into cmickeyb
2011-01-03 17:05:24 -08:00
5286198650
Add permissions hooks for object transfers
2011-01-03 19:42:58 +00:00
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
e1664b8d38
Fix child agent scoping
2011-01-03 19:42:26 +00:00
c48ddbfef1
Fix scoping for prim region crossings
2011-01-03 19:41:02 +00:00
9971766256
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2011-01-03 19:40:55 +00:00
e15ab75d62
Add permissions hooks for object transfers
2011-01-03 19:56:56 +01:00
5432dfd53a
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-02 01:29:22 +01:00
04e450e2bc
Fix child agent scoping
2010-12-31 16:05:59 +01:00
5545b03168
Fix scoping for prim region crossings
2010-12-31 15:53:31 +01:00
6820deed34
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2010-12-31 15:45:08 +01:00
24a997eb7c
Add MessageKey to section Messaging, a key that prevents injection of
...
IM from external sources
2010-12-30 20:57:56 +01:00
df5e4a1e5b
Standardize the way WebRequests are made in the SimulationServiceConnector. Added
...
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
98769ed040
Merge branch 'master' into careminster-presence-refactor
2010-12-30 02:31:43 +00:00
1f4d0ad460
Fix up a prior fix (refix the fixed fix :)
2010-12-30 02:31:05 +00:00
3b50066ceb
Merge branch 'master' into careminster-presence-refactor
2010-12-30 01:40:38 +00:00
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
2cb2bff9b2
Implement SendPlacesReply
2010-12-30 00:31:59 +01:00
dbaaccf92a
Copying a ref type under lock doesn't dissociate it from the source.
...
Use a new list to do that.
2010-12-29 21:02:45 +01:00
88db69e017
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-29 21:18:28 +00:00
64209c9be1
Fix av/prim eject problem.
2010-12-29 21:13:49 +00:00
d42e0c39fc
Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified.
2010-12-29 07:36:39 -08:00
dfc0c8dca6
Remove the restriction on communication across scopes. This will allow
...
cross-scope users to IM each other.
2010-12-29 15:13:10 +01:00
915c0b17b0
fixes a problem with ending slashes in GatekeeperService to verify session-addresses
2010-12-29 06:03:43 -08:00
94ed69b1da
Update SimianGridServicesConnector to work more like
...
a connector so we can take advantage of the logic in
RemoteGridServicesConnector.
2010-12-27 17:18:49 -08:00
6386dfd362
No need for these methods to be virtual now.
2010-12-27 16:26:29 -08:00
f801d50a8a
WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
...
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
b16173e3e8
Drop the static from default wearables. It isn't
...
static.
2010-12-27 12:43:54 -08:00
61b7ec5fb5
Fixing AbsolutePosition to correct llSensor in vehicles
2010-12-26 22:52:03 +00:00
f2dd324bc8
Fix linking link sets to rotated prims.
2010-12-26 20:42:47 +01:00
8186bf2525
Remove some code that was meant to fool the viewer into thinking SLT. It never
...
worked and it turned out the issues were really in the backend.
2010-12-26 07:29:23 +01:00
06077f775f
Fixes mantis #5279
2010-12-25 08:28:42 -08:00
b17150c3e8
Fix the corner casse of stack overflow when logging out with attachments
2010-12-25 08:05:42 +01:00
0aeafc9919
Fix the recent stack overflow
2010-12-25 07:25:56 +01:00
b23b29a53e
This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
2010-12-24 16:23:00 -08:00
75010e5e1c
Merge branch 'master' into careminster-presence-refactor
2010-12-25 00:04:46 +00:00
b16f4024db
Update child prim group positions in moving vehicles
2010-12-24 21:04:10 +01:00
3eaaaa0d99
One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
2010-12-24 08:50:00 -08:00
135b012bbd
Hopefully this fixes all prim inventory issues. No more abort, no more keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added.
...
This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
2010-12-23 19:31:37 -08:00
42d44c00f3
Change the mute list parts of the client interface so that all data is provided
...
to the module
2010-12-24 03:46:57 +01:00
2e3d0fb276
Merge branch 'master' into careminster-presence-refactor
2010-12-24 02:23:26 +00:00
d829580e5e
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-12-23 13:17:55 -05:00
c108968020
* Cleanup from a commit a while ago.
2010-12-23 13:17:33 -05:00
bc67bc0d94
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-23 10:05:45 -08:00
54418c5e69
Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.
2010-12-23 10:05:08 -08:00
70bb542727
Merge branch 'master' into careminster-presence-refactor
2010-12-23 17:20:45 +00:00
2cc07de0ba
Merge branch 'master' into careminster-presence-refactor
2010-12-23 12:08:38 +00:00
26e601a776
Put back a commented section of code. With some viewers, object inventory
...
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
efa8bd8eb3
Revert "reactivating some traces to track a dead thread"
...
This reverts commit d7df871f9f
2010-12-23 11:15:43 +00:00
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
98f0b4c72a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-23 08:14:43 +00:00
d7df871f9f
reactivating some traces to track a dead thread
...
seen @ NT and Otaku
2010-12-23 08:11:52 +00:00
d06456c8b2
Merge branch 'master' into careminster-presence-refactor
2010-12-23 02:57:45 +00:00
862da9a55f
Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
2010-12-22 17:55:58 -08:00
990e73d7cb
Fix a broken format on an error message. Also replace yet another e.Message
...
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
32cc569b00
Fix up some locking issues in task inventory. Don't use any prior versions in production!
2010-12-22 13:45:21 +01:00
cf37b3b943
Prevent a null ref when an avatar login doesn't go as planned
2010-12-22 03:25:30 +01:00
25ecd62b1f
* Adds AbortXfer to the ClientAPI mix
...
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
2010-12-21 19:15:44 -05:00
e9382c2939
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:09:12 +00:00
303c02133f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:00:01 +00:00
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
a70b597840
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:57:31 +00:00
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
da37ddff9f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:50:35 +00:00
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00:00
4093e22833
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-21 20:57:52 +00:00
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
c9aa420c2d
Restore CM loking after core extract
2010-12-21 20:48:58 +00:00
2f84f2171f
Make prim inventories a bit more sane
2010-12-21 20:47:00 +00:00
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
5fccbe21d6
Update materials parameters.
2010-12-20 07:04:35 +00:00
c082254b9d
Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
2010-12-19 19:29:07 -08:00
11eabf0e51
Merge branch 'master' into careminster-presence-refactor
2010-12-20 02:49:31 +00:00
711283d3ca
More changes to the long help text for console command link-region.
2010-12-20 02:50:19 +01:00
3b4af8a0dc
Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData.
2010-12-20 02:09:35 +01:00
2a40c8511a
Make long help text for new link-region command syntax more explicit.
2010-12-19 22:59:32 +01:00
7a78de8105
fix 'system.exception: unknown type in list.size: system.uint32'
2010-12-18 23:29:49 +00:00
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
bf9555eaee
minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid
2010-12-18 00:57:09 +00:00
ef43f98686
Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops)
2010-12-18 00:45:56 +00:00
a82112a47c
Merge branch 'master' into careminster-presence-refactor
2010-12-17 22:50:25 +00:00
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
3d32f05cde
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
2010-12-17 22:40:11 +00:00
3b1c91c24b
remove mono compiler warnings
2010-12-17 22:35:08 +00:00
0913d43c50
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
2010-12-17 22:29:43 +00:00
d7622cbedc
Fix notecards that end with an embedded object causing an exception
2010-12-16 21:01:38 +01:00
835e4dbc2c
Add locks on m_killRecord without breaking things like justin did
2010-12-16 20:49:40 +01:00
aebc011f7b
Remove some spam from FreeSwitchModule
2010-12-16 20:12:18 +01:00
4719e925b8
Revert the locking changes in LLCLientView
2010-12-16 20:11:26 +01:00
0745d65344
Put in locks on m_killRecord to replace changed locks on m_entityUpdates.SyncRoot
...
These locks are necessary to avoid a delete/update race condition for scene objects.
However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
2010-12-15 23:11:42 +00:00
d457b4c4b1
Merge branch 'master' into careminster-presence-refactor
2010-12-15 22:59:52 +00:00
62e66b17bc
Make sure the material is set on physical prims
2010-12-15 17:54:57 +01:00
ee1e725e39
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-15 08:18:02 +01:00
f8beeb1e93
Fix casts in llSetPayPrice
2010-12-15 08:15:12 +01:00
ed26376ec5
Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
2010-12-14 20:15:26 -08:00
74c68474e0
Another attempt at moving heavy computation away from the Update loop. #LoginLag
2010-12-14 18:44:26 -08:00
e3262ef5ac
Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
2010-12-14 17:50:37 -08:00
6b135ee371
fix mistake in last change of local.include
2010-12-15 00:14:43 +00:00
9d0339e8f9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 16:04:46 -08:00
a4309578e2
Another stab at #LoginLag. Looking forward to hear the feedback! This makes updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies.
2010-12-14 16:04:28 -08:00
354f568508
Merge branch 'master' into careminster-presence-refactor
2010-12-14 23:58:45 +00:00
3643be1c97
Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its contents
2010-12-14 23:46:02 +00:00
92727ad596
minor: disable debug logging for previous test
2010-12-14 23:41:36 +00:00
8a5f9b91de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 23:39:21 +00:00
81bccd6d13
Start implementing a test for 'share with group' object functionality. Not yet complete.
...
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
42c9c30e4c
Add mock group services connector and use this in tests
2010-12-14 22:57:36 +00:00
c620e4c822
add infrastructure for groups module tests
2010-12-14 22:25:01 +00:00
ff8ff773e7
Relax a highly constraining lock on m_entityUpdates that may be preventing reprioritizations from actually happening. #LoginLag
2010-12-14 12:58:32 -08:00
10ae5454cb
Made the map thread request the map items asynchronously, as the name suggested -- but with a cap of 20 async requests max at any given time.
2010-12-14 12:16:51 -08:00
4357288a94
More on mantis #5270
2010-12-14 11:24:23 -08:00
5ce296e08d
Workaround to allow llHTTPRequest to POST data to Lighthttpd which doesn't support Expect: 100-Continue
2010-12-14 09:14:34 -08:00
55e04e6c68
Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims.
2010-12-14 08:11:49 -08:00
cb51fc129e
Merge branch 'master' into careminster-presence-refactor
...
Also fix the failure to fire CHANGED_LINK on sit, which is different in our
code.
2010-12-14 12:12:27 +00:00
e47cc10674
Null checking ParentGroup is not needed. It can't be null.
2010-12-14 12:07:35 +00:00
4bdba0a487
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 21:36:08 -08:00
b41164b620
This seems to get rid of the stuck PREJUMP animation, as reported by Justin in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others.
2010-12-13 21:35:40 -08:00
e08da02a0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 00:12:17 +00:00
e62b3dba8a
reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being used by a 3rd party region module and contains non-obvious attachment specific code
...
There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
2010-12-14 00:11:41 +00:00
2a9f095071
Fix a small bug in ban list handling
2010-12-13 22:14:34 +00:00
6528fc5c64
Fix a small bug in ban list handling
2010-12-13 22:27:03 +01:00
9bd7f3b03a
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:35:56 +00:00
d6803e6448
Change some lookups in he Land Management module to make group permissions
...
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 20:28:14 +00:00
a4588befb7
Changed logging level for message about failure to retrieve a map image from a linked region.
2010-12-13 22:00:34 +01:00
9a24c0b41c
Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.
...
Configuration option AssetService in section [GridService] must be set to enable this functionality.
Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270 .
2010-12-13 21:20:48 +01:00
7538926292
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-13 20:20:02 +00:00
d2ff4ebf2d
Merge branch 'master' into careminster-presence-refactor
2010-12-13 20:19:10 +00:00
6b8d01d8c4
It turns out that the 1/2 sec burst for prims download is not a bug, but a feature of the client. The client sets the throttles in such a way that makes the server behave like that. The same happens in the Linden Grid.
...
Revert "This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond."
This reverts commit 870bbcfc6c
2010-12-13 11:45:17 -08:00
6b374fa547
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:19:52 +01:00
fe6c655f70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 09:43:54 -08:00
870bbcfc6c
This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond.
2010-12-13 09:42:27 -08:00
d36b880022
Change some lookups in he Land Management module to make group permissions
...
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 11:13:34 +01:00
9f9af315ec
Correct Sensor axis for unattached daughter prims.
2010-12-12 23:26:58 +00:00
d3b081744e
Prevent objects that are worn from ground from vanishing from the scene
2010-12-12 22:12:50 +01:00
63353a0687
Fix a perms issue when wearing an object from inworld
2010-12-12 21:24:00 +01:00
7f0350b988
Trigger event with flag CHANGED_LINK when agent sits on objects that have not a sit target defined. This fixes Mantis #4692 .
2010-12-12 20:12:34 +01:00
663a626a6f
Apply the useful part of diva's patch that was skipped
2010-12-12 08:57:26 +00:00
28022a9198
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:22:50 +00:00
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
4d16ecf889
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-11 17:07:08 -08:00
797ca8d0e7
Fixes the nudge movements!
2010-12-11 17:06:17 -08:00
95a915efd8
Fix border fence for physicals. Fix llRotLookAt() for Vehicles.
2010-12-11 21:04:03 +00:00
69538d14d4
More OSSL function name normalization, this time for osParcelSetDetails.
2010-12-11 11:41:45 +01:00
c42876df67
Revert "Another stab at mantis #5256"
...
This reverts commit ccb4f958c0
2010-12-10 23:32:50 -08:00
18b10fab60
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 23:16:47 -08:00
ccb4f958c0
Another stab at mantis #5256
2010-12-10 23:16:26 -08:00
b46de6e025
Remove the restriction that you have to be logged in when loading/saving iars
...
This is pointless as we're supplying the password on the command line
2010-12-11 03:09:00 +00:00
711db25dfa
Allow floats in the list for llSetPayPrice and silently convert them to int,
2010-12-11 03:31:57 +01:00
387f743993
If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases.
2010-12-11 02:18:16 +00:00
373ef594ba
Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
...
Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
b512ecd1dc
Normalization of OSSL function names.
...
Added the following replacement functions for compliance to the OSSL standards stated on the wiki:
osGetTerrainHeight
osSetTerrainHeight
osGetSunParam
osSetSunParam
osSetPenColor
The functions that do not comply to the standard give a warning when used but work normally otherwise.
The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour".
The following two functions have been renamed because they are not enabled yet aynway:
osWindParamSet => osSetWindParam
osWindParamGet => osGetWindParam
2010-12-10 22:20:35 +01:00
d8fd917076
Revert "A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues."
...
This reverts commit f84905e294
2010-12-10 12:40:12 -08:00
58b251506c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 11:33:09 -08:00
f84905e294
A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues.
2010-12-10 11:32:46 -08:00
6f37290f4c
Adjust hypergrid console commands to latest changes.
2010-12-10 17:48:45 +01:00
a918c8df97
fix the minimap sitting avatar location bug
...
a sitting avatar should have it's offset position added to the scene object, not its absolute position
2010-12-10 03:46:16 +00:00
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
cefdee8aaf
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
2010-12-09 16:52:37 -08:00
baa8ddfd26
Minor bug fixes. Hunting down mantis #5259
2010-12-09 08:28:21 -08:00
ab980fc927
Fixed wrong comment
2010-12-08 19:47:05 -08:00
90bcfefe09
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
2010-12-08 19:37:35 -08:00
7fef89847c
Merge branch 'master' into careminster-presence-refactor
2010-12-09 02:24:12 +00:00
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
2010-12-08 18:53:15 -08:00
4df1d25d23
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
f28dc77ab4
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 02:01:41 +01:00
796216e44f
Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
2010-12-07 20:05:53 -08:00
7cfb3d7e96
Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up.
2010-12-07 17:17:06 -08:00
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
80b84e4bad
Prevent sending of attachment data to any client if the attachment
...
is not actually attached to any avatar. Another stab ad fixing "HUD hair"
2010-12-08 00:08:14 +01:00
b9f54fca5d
Allow TPing multiple people in the friends list in one go.
2010-12-07 23:01:42 +01:00
549f90c5b5
Update calling card interface
2010-12-07 04:45:28 +01:00
a4f7937eb3
Add the interface needed to revive calling cards
2010-12-07 03:08:48 +01:00
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 01:07:57 +01:00
b960a05e67
Cowardly refuse to keep running when no application plugins are loaded.
...
Prevents empty instances from hanging around when Mono.Addins messes up
2010-12-07 01:07:13 +01:00
b1a5c03985
Lock the attachments dict so it doesn't get out of sync when iterating
2010-12-06 17:40:07 +01:00
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
835103af82
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 21:50:48 +00:00
9b9ce8fb27
add more detail to the log in case of FORM Timeout
...
cause nothing relevant are in the services logs
2010-12-04 21:40:18 +00:00
4b979362e9
Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims
...
Removed some unneccessarily wordy core comments
2010-12-04 14:41:57 +01:00
96446adfa4
Monitor the UUIDs used to create and update wearable assets. Reject any changed
...
texture that is not present in the user's inventory full perm.
This will prevent "UUID snatching", a copybot-type of attack that can cause
clothing makers to be forced to destroy and replace legit items in order to
invalidate the copies.
2010-12-04 07:06:30 +01:00
4ca108f85e
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +00:00
ea17b262a3
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
f41dfbabc8
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 05:01:44 +01:00
349767f8a2
Merge branch 'master' into careminster-presence-refactor
2010-12-04 04:25:39 +00:00
bab6b6cd87
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 04:36:44 +01:00
da91a2ab7e
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:33:14 +01:00
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
0ab774d484
add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project
2010-12-04 01:06:29 +00:00
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +00:00
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
8e3bacc691
When linking something, immediately persist the linked set.
2010-12-03 23:06:44 +01:00
bf695cccba
Fix spurious Av move when clothing item worn or removed.
2010-12-03 18:32:58 +00:00
60b055de4c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-03 19:04:59 +01:00
4407c4700f
Fix status responses in remote admin
2010-12-03 19:02:42 +01:00
8741676bc3
Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region.""
...
This reverts commit 6c01ebb875
2010-12-03 18:32:03 +01:00
b940925173
Improve health reporting
2010-12-03 07:27:29 +01:00
e913e1690e
Fix health reporting. This will now actually monitor the threads properly
...
and not just the http server. It will also restart a dead heartbeat.
2010-12-03 07:16:06 +01:00
ce1aedf474
Add a missing interface memeber to the new HG stuff
2010-12-03 07:04:07 +01:00
6c01ebb875
Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region."
...
This reverts commit 2827deffe8
2010-12-03 04:39:51 +01:00
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
ec01936d38
Change the way sim health reporting reports sim startup
2010-12-03 02:37:08 +01:00
7e72afcb3e
Only force prim persistence before delete if the prim is the result of an unpersisted delink
...
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
5246d98b8d
Stop LLUDPServer sending updates after object deletes by always queueing deletes
...
If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog
This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately.
Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates.
In tests, this doesn't appear to affect performance.
There is probably still an issue present where an update packet might not be acked and then resent after the kill packet.
2010-12-02 02:01:01 +00:00
26569a7cd0
minor: add some method doc
2010-12-02 02:01:01 +00:00
7d24dbca3c
Added some comments. Better than listening to the boring speaker...
2010-12-01 16:01:22 -08:00
ab2adaf341
Various bug fixes for appearance handling
2010-11-30 16:20:43 +01:00
0218845c2e
Prevent the restart module from barfing if it's not configured
2010-11-30 15:40:50 +01:00
b08cc63003
Change inworld restart to use blue boxes rather than notices to match SL
2010-11-29 21:45:03 +01:00
f3835fe15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-29 09:58:20 -08:00
49b59fffee
Fix unit test.
2010-11-29 09:57:41 -08:00
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
04ce7de5ed
Fix the build break
2010-11-29 01:15:30 +00:00
836b73f765
Fix the build break
2010-11-29 01:15:02 +00:00
0acfe80f21
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:37:21 +00:00
4d104cf6fe
Make gatekeeper's address check case-insensitive.
2010-11-28 23:35:38 +00:00
5aeb83125a
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:30:55 +00:00
2bee150aac
Implement health monitoring of the packet receiving and sending threads
2010-11-28 20:45:03 +01:00
0f1fc79994
Implement god summons
2010-11-28 20:14:58 +01:00
ca8d015733
Changed the parser for InventoryItem deserialization. Moved some utility functions around.
2010-11-27 11:40:54 -08:00
4765fd9cd0
Remove hard limit on prim owners. The new LibOMV autosplits packets to
...
prevent overflow
2010-11-27 19:31:18 +01:00
2412b3cb4a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-27 13:07:23 +01:00
0b41606e73
Instrument TI Dictionary to finally find that pesky script-caused deadlock
2010-11-27 13:02:51 +01:00
d71d4f96e3
Amend GetLinkPrimitiveParams with implementations for PRIM_TEXGEN, PRIM_BUMP_SHINY, PRIM_FULLBRIGHT, and PRIM_GLOW
2010-11-27 10:59:14 +01:00
947d730b56
Make gatekeeper's address check case-insensitive.
2010-11-27 09:18:39 +01:00
3292a22558
Creator information preserved upon HG transfers.
2010-11-26 22:06:34 -08:00
35c6bba6d7
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:29:01 +00:00
63e2c3b2d6
Reformat an overzealous comment. Remove end of line marks and reference to the
...
Mantis solved, as that isn't needed to understand the code. Reformat the
comment for 80 col screens.
2010-11-27 01:28:02 +00:00
6ed63487d9
llUnsit position fix 4063 (updated 11-20-2010)
2010-11-27 02:05:44 +00:00
a8a8fb6e13
llVecNorm nant test
2010-11-27 01:29:55 +00:00
e0866faacc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-27 01:27:46 +00:00
a1ab2a2244
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:25:02 +00:00
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
e05f728b08
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:08:12 +00:00
0e311a2104
If we fail to gather asset uuids for a particular asset, log the failing asset id and type
2010-11-27 00:54:09 +00:00
385a6c4b34
Convert the scope id in the im session id to a URL variable. Fixes offline
...
group notice attachments not working
2010-11-26 23:20:43 +01:00
7c02d5cec5
Another attempt at fixing failing test for creator info.
2010-11-26 23:04:31 +01:00
2827deffe8
Trigger changed event with CHANGED_TELEPORT when teleporting to another region.
2010-11-26 22:46:48 +01:00
0bc5ffbe96
Fix handling of landmarks for systems with culture settings other than en_US. This fixes Mantis #5177 .
2010-11-26 11:50:51 +01:00
cccfd1db34
Add marker files to the restart module so external scripts can be used to
...
kill a process that hasn't restarted properly
2010-11-26 03:21:51 +01:00
1cbd2842d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-25 16:27:19 -08:00
33c023bf6a
Allow group lookup during tp / login to make restricting parcels to group
...
work.
2010-11-25 21:22:22 +01:00
ee9aca9c52
Add the ability for gods to impersonate users. For this, bit 6 needs to be
...
set in the target's UserFlags and the impersonator must have UserLevel 200
or above. The user can then log in using the target's name and their own
password.
2010-11-25 20:34:55 +01:00
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
2010-11-25 11:14:16 -08:00
2d2098f5da
Export the module interface for restart
2010-11-25 04:06:25 +00:00
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
c14592d4ba
Export the module interface for restart
2010-11-25 04:16:34 +01:00
efb03f6f99
Fix a bug caused by leftover code
2010-11-25 03:59:57 +01:00
e74b0deb4e
Fix up remote controller.
2010-11-25 03:43:23 +00:00
6c3eb21440
Merge branch 'master' into careminster-presence-refactor
2010-11-25 03:27:35 +00:00
fb97fe8307
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
1522567920
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:37:50 +01:00
eb9d7bff6c
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-25 01:25:56 +00:00
2c1c04119d
Merge branch 'master' into careminster-presence-refactor
2010-11-25 01:24:32 +00:00
6734c9f83a
Implement the restart module
2010-11-25 01:22:05 +00:00
e14f449cc2
Adding the skeleton for the restart module
2010-11-24 22:14:53 +00:00
b3a71c6df1
Prevent an overlength button label from producing a debug dump and aborting
...
the script.
2010-11-24 18:56:25 +01:00
9f29908f66
catch an exception when a mesh asset header cant be decoded
2010-11-24 02:05:41 -08:00
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -08:00
a47fb93b74
Prevent a dump in the llGetLinkKey method when using LINK_ROOT in a single prim
2010-11-23 23:48:52 +01:00
a4bf6c5343
Attempt at fixing failing test.
2010-11-23 07:44:42 -08:00
6557d5f359
Merge branch 'master' into careminster-presence-refactor
2010-11-23 14:05:09 +00:00
2527aeb40c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-23 14:03:52 +00:00
61a49ec4a8
Initialize InventoryItemBase.creatorData properly. Could throw.
2010-11-23 06:36:57 -08:00
45b08a9ce3
Fix more potential nullrefs
2010-11-23 14:02:20 +00:00
7796b90ebb
Fix some crashes caused by the addition of the CreatorData column
2010-11-23 14:02:06 +00:00
c68f03a6ff
Fix: Allow use of parameters without specifying a file path with command "save oar"
2010-11-23 11:45:12 +01:00
ba2bf78dcf
Fix joining land parcels not being stored correctly in SQLite. Thank you to goetz for the initial patch in Mantis #5230 .
2010-11-23 11:45:12 +01:00
8d79a39d5b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-23 04:27:06 +00:00
63170fdea7
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
2010-11-23 04:26:07 +00:00
4a54b3318b
Fix more potential nullrefs
2010-11-23 00:31:09 +01:00
bbc291dfdf
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
2010-11-22 23:07:30 +00:00
34b13a4765
add basic tests to check that under default permissions module owner can delete objects and that non-owners (who are also not administrators, etc.) cannot
2010-11-22 22:54:13 +00:00
571becefb6
Fix some crashes caused by the addition of the CreatorData column
2010-11-22 23:31:29 +01:00
e1c72cedb3
Let CHANGED_SCALE also trigger when editing prims and linksets with the viewer's edit tools.
...
This event used to trigger only when the scale was changed with a script.
2010-11-22 19:38:44 +01:00
d63965cf94
Let CHANGED_SHAPE trigger. This fixes Mantis #1844 .
2010-11-22 19:38:44 +01:00
d2aebbe066
Fox case on a method
2010-11-22 14:27:45 +00:00
506192e466
Make an invalud key string in llTextBox and llDialog non fatal to avoid
...
breakinf sloppily made no-mod scripted items.
2010-11-22 15:16:28 +01:00
4e0a289a8d
Change FS Voice module to a shared module to avoid gratuitious server handler
...
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
2010-11-22 14:13:27 +00:00
54d1d6d917
Fox case on a method
2010-11-22 14:32:51 +01:00
87f30709a2
Merge branch 'master' into careminster-presence-refactor
2010-11-22 14:14:45 +00:00
8a2c365e5b
Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
...
Fixes Mantix #5214 .
2010-11-22 10:39:46 +01:00
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
8466ada8e0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-22 00:46:37 +00:00
0fec29c849
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-21 17:19:45 -08:00
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
ddf08276f1
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:46:23 +00:00
7e9a3019ac
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:55:11 +01:00
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00:00
c85e6bc36d
Add the remote connector for freeswitch config retrieval
2010-11-21 23:42:52 +00:00
5f8a0f3d1f
Add the remote connector for freeswitch config retrieval
2010-11-21 23:41:56 +00:00
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
a7174cecdd
Remove username and password from the publicly accessible FS config
2010-11-21 22:45:04 +00:00
6fa24f4671
Convert the Freeswitch module to new style
2010-11-21 22:40:03 +00:00
e6c52f38c5
Strip the dialplan and directory methods from the region module
2010-11-21 22:25:50 +00:00
2b0ef9ad1d
Implement a method to allow regions to query the gridwide Freeswitch
...
configuration from ROBUST
2010-11-21 22:17:25 +00:00
af8c8197ab
Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still used?!?
2010-11-21 13:29:20 -08:00
ed5f91c638
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:29:17 +00:00
c0ccfeebe7
Start implementing Freeswitch in ROBUST
2010-11-21 21:29:11 +00:00
51343caeb5
Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of SOP.CreatorID. Untested, but should work.
2010-11-21 13:27:03 -08:00
83a427a8f9
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:18:03 +00:00
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
1cf8eb8a90
Start implementing Freeswitch in ROBUST
2010-11-21 20:59:01 +00:00
f1151f20dc
Fix global region coordinates that are delivered by llRequestSimulatorData.
...
Also did some source code clean-up by replacing literals with constants.
2010-11-20 03:03:11 +00:00
a88bcbb118
Knock V0_2 decals off archive tests since they're misleading
2010-11-20 03:01:47 +00:00
d7bca3d8e8
Fix unit tests and save problems
...
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
1087d6042b
correct build break. for some reason, xbuild didn't rebuild test dlls
2010-11-20 02:43:38 +00:00
f49e32bfaa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-20 02:34:27 +00:00
2c7be7130e
Bump oar version to 1.0 from 0.5
...
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
164007dd00
Merge branch 'master' into careminster-presence-refactor
2010-11-18 19:06:09 +00:00
8f1a79420b
Fixed appearance send for avatars with only default textures. This should fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-18 19:04:50 +00:00
f3e4000a55
Send media and other parcel data to client on login. Makes streams visible
...
right away and starts media.
2010-11-18 13:26:35 +01:00
47f0468995
Send parcel data upon becoming root. This will make streams play and build
...
flags be set properly
2010-11-18 04:18:43 +01:00
095e3aae67
Allow llDialog without any buttons and add the automatic OK button as it is
...
in SL.
2010-11-18 01:11:11 +01:00
859234f963
small refactor: reuse existing commandLine string rather than calling cmdline.ToString() again
2010-11-17 23:50:23 +00:00
c072a9cfb3
save all lines to history, not just those which turn out to be valid comands. does not store passwords
...
also, blank lines are not stored to history
this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again
2010-11-17 23:34:39 +00:00
af0deff7e9
Make "show queues [full]" behave like "show users [full]"
...
Now, "show queues" only shows root agents. "show queues full" will show child agents as well
2010-11-17 22:55:20 +00:00
c4f3175e17
add "Unacked bytes" column to "show queues"
...
This should show the number of bytes sent to the client that it has not yet acknowledged.
2010-11-17 22:55:19 +00:00
2a17c39dfe
Fix "show queues" console command
...
For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.)
Sometimes useful for diagnostics
2010-11-17 22:55:19 +00:00
e6eeaaea67
minor: add some method comments
2010-11-17 22:55:06 +00:00
3bc9c1adb4
Merge branch 'master' into careminster-presence-refactor
2010-11-17 18:21:35 +00:00
0d72d77629
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-17 18:20:41 +00:00
43c270b536
Fix gesture and viewer preview sounds not playing
2010-11-17 18:20:24 +00:00
2e5ae1b013
Fix gesture and viewer preview sounds not playing
2010-11-17 17:54:32 +01:00
80d3998001
Recalculate prim counts when a parcel is deeded
2010-11-17 17:54:03 +01:00
393c9c9046
Add osUnixTimeToTimestamp()
...
This allows an input unix time to be converted to an llGetTimeStamp() format.
Thanks Thomax.
2010-11-17 01:45:47 +00:00
b38a1594c1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-17 01:28:46 +00:00
390c3a3b6f
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:18:35 +00:00
0049ec16f5
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:26:07 +01:00
c4eb430ad2
Merge branch 'master' into careminster-presence-refactor
2010-11-16 21:15:15 +00:00
7bb005b0d1
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 21:01:56 +00:00
d4d45c3acb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-16 20:47:29 +01:00
4f15b8d4e6
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 20:44:39 +01:00
c5d78c723b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-16 19:18:43 +00:00
56bd42b438
Fix osTeleportAgent for hypergrid destinations.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 15:23:45 +00:00
50202bab7c
Add osTeleportOwner.
...
This provides the same functionality as osTeleportAgent but without the griefing potential. Region owners need not be concerned about the use of this function because it only allows to do what is already possible with the world map.
The intended use is with HUDs. For example, a list of (hypergrid) destinations could be made available for quick access.
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 13:43:27 +00:00
e7e3c74fb7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-16 10:22:15 +00:00
5329e3b9b7
Can't detach an object from within the script thread because it will throw. Use FireAndForget for that.
2010-11-16 01:36:26 +00:00
98ba079e95
Diva needs a spanking! Serializing OldItemID breaks script state persistence in agent inventory.
2010-11-16 01:35:16 +00:00
c2ac5dc358
Can't detach an object from within the script thread because it will throw.
...
Use FireAndForget for that.
2010-11-16 01:37:44 +01:00
7a9c57a81e
When detaching a scripted item, always consider it modified. Script states
...
will have changed and for real usability, we need to save it. It bloats
assets, but that can't be avoided.
2010-11-16 01:35:45 +01:00
0f152bfe8c
Diva needs a spanking! Serializing OldItemID breaks script state
...
persistence in agent inventory.
2010-11-16 01:33:24 +01:00
98f29a47c0
Do not include hyperlinks in a random region search during a login.
...
Before a random region is chosen, available fallback regions are used for the login.
2010-11-13 00:40:03 +00:00
1e7334d985
provide avatar name in log if an exception ends up at the top of an async packet processing stack
2010-11-12 23:20:07 +00:00
00b0f521fa
Add PARCEL_DETAILS_ID to LSL
2010-11-12 01:16:14 +00:00
b2aeea66e3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-11 04:51:05 +00:00
9462a1861b
Fix excessive forward motion and flailing while descending a slope, prevent adding motion while falling from flying.
2010-11-11 04:49:47 +00:00
bfc128529c
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:20:19 +00:00
aace455249
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:22:55 +01:00
ff3e466000
Remove a debug spam
2010-11-10 01:17:40 +00:00
846198bb9e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
b68f701c00
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-09 23:55:19 +00:00
fa64f2e56e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:54:08 +00:00
ee85a530f6
Merge branch 'master' into careminster-presence-refactor
2010-11-09 22:16:48 +00:00
22144eb8f7
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 22:15:59 +00:00
d206721e2f
Add option SeeIntoBannedRegion to allow band to act like SL, where you can
...
see in but not enter. Defaults to false, so no change.
2010-11-09 22:41:40 +01:00
dfe11566f4
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 20:18:36 +01:00
ccfbce3176
Remove "OpenSimulator" from startup message
2010-11-09 16:07:43 +01:00
09ea73f7cc
Change "OpenSim" to "Careminster" and remove CM suffix.
2010-11-09 15:33:03 +01:00
15da52d73a
Prevent temp-on-rez prims from being persisted
2010-11-08 19:00:03 +01:00
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
df0787f5cf
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:08:02 +00:00
798abd1508
Reinstate a lost fix
2010-11-08 03:06:58 +00:00
8a97d58f09
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:05:07 +00:00
6056ae8d88
Fix merge artefacts
2010-11-08 02:58:33 +00:00
18b27408d6
Prevent plants from being treated like dropped attachments and removed
...
from the sim.
2010-11-08 02:39:06 +00:00
4f6dd8bda3
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-11-08 02:38:15 +00:00
2f58d56137
Call the Cleanup when an agent logs out, when an agent leaves and just
...
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-11-08 02:37:28 +00:00
d8fffd0fb5
Call attachment cleanup when an agent crosses out
2010-11-08 02:37:00 +00:00
2317b6767b
Add a method to delete left over / dropped attachments
2010-11-08 02:36:51 +00:00
6585243113
Detach attachments displaced by other attachments
2010-11-08 02:35:47 +00:00
5a3cd9f1d0
Decrease min search length to 2 chars for map search.
2010-11-07 16:08:41 +01:00
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
4db60a5a40
Fix the inventory transfer module to not cause duplicated text IMs
2010-11-05 15:24:08 +01:00
7844872067
Fix merge artefacts
2010-11-05 14:46:13 +01:00
644eb9fd7f
Fix playing sound from HUDs
2010-11-05 13:45:28 +00:00
e078c57bf0
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-11-05 13:39:04 +00:00
1c8d19d714
Delete existing presences for a user ID when they log in again.
...
WARNING!!! This changes a default. The old default is to allow multiple
presences, the new default disables this. As the feature currently has no users,
this should not present any difficulty and will alleviate the presence
issues somewhat.
2010-11-05 13:31:45 +00:00
ddd3c6824a
Revert "Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)"
...
This reverts commit 40e05f4109
2010-11-05 14:27:53 +01:00
f985775962
Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready."
...
This reverts commit 91b1d17e5b
2010-11-05 14:27:14 +01:00
6bac92db80
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-05 13:34:54 +00:00
53d64f755a
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:33:58 +00:00
893915ce0b
Fix child prims returning after being unlinked and deleted where the root is
...
not deleted
2010-11-04 21:09:59 +01:00
82e534a029
Fix avatar to avatar inventory gives across servers
2010-11-04 19:07:43 +01:00
b8924167e0
Fix creation of a duplicate physics actor on chained drag-copy operations,
...
the main cause for "ghost prims"
2010-11-04 10:37:39 +01:00
c2bd6ccdb8
Fix playing sound from HUDs
2010-11-03 23:20:30 +01:00
5f8ab9f018
Merge branch 'master' into careminster-presence-refactor
2010-11-03 02:34:36 +00:00
6c3b7617b0
Add lsClearWindlightScene() to the lightshare module to remove WL settings
...
from a region and allow normal day cycles to be reestablished
2010-11-03 02:31:43 +00:00
4ab9d37a8e
When LightShare is enabled, the standard day cycle is bypassed and replaced by
...
midday defaults when no specific LightShare profile is set.
This prevents LightShare info being send out when the region has no LightShare
profile, allowing normal day/night cycles to happen.
2010-11-03 02:04:17 +00:00
c25f84e31c
Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
...
so it reflects the prior default. We are not in the habot of changing default
behavior without good reason and making localhost the default would break
most current use cases.
2010-11-03 01:13:01 +00:00
1f77f05f02
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:12:48 +00:00
636ca6218d
Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
...
so it reflects the prior default. We are not in the habot of changing default
behavior without good reason and making localhost the default would break
most current use cases.
2010-11-03 01:11:04 +00:00
d5d0e81df2
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:09:38 +00:00
e9ec187746
Merge branch 'master' into careminster-presence-refactor
2010-11-03 00:48:18 +00:00
57eabe9d46
Actually calculate the height before setting it, this isn't done automatically
...
on incoming transfers in all cases.
2010-11-03 00:47:22 +00:00
7d551e27ca
Trying to prevent a wrong physical actor size
2010-11-03 00:01:47 +00:00
797e461ef9
Merge branch 'master' into careminster-presence-refactor
2010-11-02 23:41:13 +00:00
d555c373d8
Fix avatar height management
2010-11-02 23:39:45 +00:00
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
43ac44b028
Fix default club feet
2010-11-02 21:41:27 +00:00
5eeabb8b4b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-02 21:29:02 +00:00
78a0ed3ff9
Fix sitting and standing up
2010-11-02 21:28:24 +00:00
4fdab71c8d
Add support for cross-domain AJAX requests to REST console.
...
Enables RemoteConsole to add the appropriate HTTP header when responding to requests that use Cross-Origin Resource Sharing (CORS with simple requests). The allowed origin is set with configuration option "ConsoleAllowedOrigin" in section [Network]. For a suggestion to make this configuration option more flexible, see the TODO comment in the source code.
The WifiConsole uses this functionality with grid mode.
2010-11-02 14:12:25 -07:00
4d1f0c5348
Support for CORS with simple requests in BaseHttpServer
2010-11-02 14:11:49 -07:00
e327e990f5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-02 19:55:27 +00:00
63ffdcf53a
Try to not make avatars switch outfits
2010-11-02 19:55:05 +00:00
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
ed7959ddfb
Thanks Snoopy for a patch that addresses Mantis #0005165 : osSetDynamicTextureURL crashed region server
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-11-02 02:35:56 -07:00
2bce1716af
Fix HypergridLinker.Check4096()
...
Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
2010-11-01 08:01:31 -07:00
12d61d1ef5
Merge branch 'master' into mantis5110
2010-10-31 20:50:39 -04:00
f15f0ab59b
Removed a couple of very verbose debug messages.
2010-10-31 12:11:30 -07:00
0a56cfbfd5
* better semantics for link-region command
...
* actually parse name for new link-region command
2010-10-30 22:51:52 -04:00
95a0ea78f9
Merge branch 'master' into mantis5110
2010-10-30 18:28:07 -04:00
48f6d47744
Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight.
2010-10-30 12:30:03 -07:00
623cee1ffc
Move physics actor creation to after SetHeight to try and prevent
...
bowlegginess. Didn't work but is better this way anyway.
2010-10-30 19:17:52 +01:00
96a29c43b0
Merge branch 'master' into mantis5110
2010-10-30 14:11:02 -04:00
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
e98d8d500f
Fix logins and avatar appearance. Contains a Migration. May contain nuts.
...
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00
09bf9d5fca
* AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer.
2010-10-30 02:26:48 -04:00
9e7d3e0f25
Merge branch 'master' into mantis5110
2010-10-29 23:59:16 -04:00
c8d65c359f
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
594f23ff22
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Services/GridService/HypergridLinker.cs
2010-10-29 23:46:53 -04:00
d219317074
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
d0895a4a3a
On first login, Ruth is back now. Strangely, inventory items are created for
...
tattoo and alpha layers. Any change of appearance in the sim makes the green
gnome reappear on next login. Progress of sorts.
2010-10-30 03:28:59 +01:00
adef6b04cb
Logins work now, but avatars are green ugly gnomes.
2010-10-30 02:52:59 +01:00
ba6f651b06
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 02:26:18 +01:00
f9227977f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-30 03:07:45 +01:00
45220a6954
minor: remove some old commented out code
2010-10-30 03:01:40 +01:00
ff7da2082d
This commit fixes all the appearance related null refs. Still can't log in,
...
client displays a blank error box.
2010-10-30 02:25:25 +01:00
343c894658
Set async_packet_handling = true by default
...
Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously.
Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably.
Of course, a lot of login lag is still coming from other sources.
2010-10-30 01:35:12 +01:00
ade71c9ed7
Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info
2010-10-30 01:32:56 +01:00
46362cd1c0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:58 +01:00
7503c4ad61
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:42 +01:00
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
09705514ff
tweak a few more scene presence logging messages for consistency
2010-10-29 23:52:25 +01:00
e66ec432af
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
2010-10-29 23:45:10 +01:00
abcde41c0d
Merge branch 'justincc-dev'
2010-10-29 23:15:35 +01:00
25e19ba7e9
add timing report to CompleteScenePresence for diagnostic purposes
2010-10-29 23:03:11 +01:00
bcd784b316
for now, comment out some older or redundant log debug lines to make diagnostics easier
2010-10-29 21:49:26 +01:00
f19816aeb9
Add number of ms it takes to complete UseCircuitCode packet handling to log for diagnostics
2010-10-29 21:38:26 +01:00
69c1e0b2f7
Merge branch 'master' into careminster-presence-refactor
2010-10-29 21:22:35 +01:00
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
49fa7e91b9
Clean up some cruft from the last commit. Re-add the initial update
...
send in the scene presence constructor... need to figure this out
later.
2010-10-29 13:45:59 -07:00
f5c9a56c8b
Bunch of fixes that reduce the number of times appearance
...
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
5f4badf9e2
Add my work on top of cmickeyb's
2010-10-29 20:44:29 +01:00
05d2302c62
Merge branch 'dev-appearance'
2010-10-29 20:24:14 +01:00
e6fe83cd93
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This work conflicts with cmickeyb's more extensive, related work
This reverts commit 9c829c0410
2010-10-29 20:17:59 +01:00
840b75ca9b
Add my work on top of cmickeyb's
2010-10-29 20:48:37 +02:00
9331898c32
Merge branch 'master' into careminster-presence-refactor
2010-10-29 20:40:48 +01:00
dbd1a68b58
Fix a LSL issue and a prim naming issue
2010-10-29 20:35:06 +02:00
3231602b88
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This reverts commit e6a8d2872c
2010-10-29 20:34:53 +02:00
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
e6a8d2872c
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:59:53 +02:00
7b0d643999
HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions.
...
* Added check for already occupied region coordinates.
* Optimized Check4096.
2010-10-28 17:21:17 -07:00
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
0f28fa400d
Added background thread to handle delayed send and save of appearance
...
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
2010-10-28 09:00:39 -07:00
a51a545cb9
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-10-28 13:24:45 +01:00
727838f914
Formatting cleanup.
2010-10-28 00:37:32 -04:00
05dbe4f2c4
Merge branch 'master' into careminster-presence-refactor
2010-10-27 20:49:27 +01:00
1fcac7203d
Prevent nullrefs in scene object deletion. Mantis #5156
2010-10-27 20:47:27 +01:00
a4e95c0717
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-26 21:20:18 -07:00
5968d343bb
Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications
2010-10-26 21:19:33 -07:00
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
9cfd3e1d5a
Small cleanup and add more debugging information
2010-10-26 12:54:28 -07:00
9132e251aa
Made the check for texture assets asynchronous. This is one part of
...
a bigger clean up that needs to happen around locks on appearance.
2010-10-26 12:53:15 -07:00
5da2743c37
Merge branch 'master' into mantis5110
2010-10-25 22:27:35 -04:00
6e58c3d563
Half of the compatibility is working. Login into a new region with
...
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
657cceb884
Intermediate commit for backward compatability; does not compile yet
2010-10-25 09:42:28 -07:00
3113cc9129
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-25 01:24:42 +01:00
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01:00
cf78f3fae3
Comment repeated add and remove of avatars from the physical scene. It's no
...
longer needed.
2010-10-25 00:53:38 +02:00
c74c1620a1
* Updated libomv to r3461
...
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
dd7f9ed7bf
Implement llGetLinkNumberOfSides(), needed for 1-script sculptie foot shoe
...
scripts.
2010-10-25 00:33:34 +02:00
07db35697b
Merge branch 'master' into mantis5110
2010-10-24 15:01:01 -04:00
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
852c61aaa6
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:17:21 +01:00
61137eac22
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:19:48 +02:00
2f0a3391ee
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-24 17:21:16 +02:00
5f266fd571
Change the results from llGetPrimitiveParams to be the same as SL for
...
the prim position. This will make attached resizer scripts work like SL.
Existing resizers may be affected adversely.
2010-10-24 17:18:21 +02:00
627d1a42fe
Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object.
2010-10-23 20:39:41 -07:00
d0c707209a
Prevent an exception if a string passed into llXorBase64StringsCorrect is not
...
a base 64 string. Return the empty string in this case.
2010-10-23 22:40:56 +01:00
5ddb8b535e
* a bit of additional debugging:
2010-10-23 00:18:19 -04:00
9a78281f82
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-23 00:22:23 +01:00
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
80f90229e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-22 23:56:58 +01:00
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e8f34e46d74
2010-10-22 23:52:07 +01:00
21187f459e
Merge remote branch 'otakup0pe/mantis5110'
2010-10-22 23:35:07 +01:00
8f34e46d74
Revert "* refactor refactor refactor ServerURI 4 lyfe"
...
This reverts commit 55974df14b
2010-10-22 23:35:01 +01:00
783b1b548f
Revert "* additional serveruri cleanup"
...
This reverts commit 19119d7705
2010-10-22 23:34:53 +01:00
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -04:00
a490b34b6e
Revert "* more url / hg cleanup"
...
This reverts commit 58f75fa19d
2010-10-22 23:34:44 +01:00
cddcb53b17
Revert "* remove some spurious debug info"
...
This reverts commit 017b83d0a3
2010-10-22 23:34:37 +01:00
d58967be58
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 18:33:59 -04:00
6d7ce63085
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 18:33:55 -04:00
a7a8fdc7da
print IAR version number on console when saving
2010-10-22 18:33:52 -04:00
bdd6857006
Implement guard against trying to load incompatible version IARs
2010-10-22 18:33:47 -04:00
607c07b4aa
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 18:33:41 -04:00
772dbf59f3
slightly simplify oar control file loading code
2010-10-22 18:33:35 -04:00
460b9fffe5
write IAR control file first in the archive rather than last
2010-10-22 18:33:32 -04:00
e06acae965
Allow region modules to know which agents actually receive chat
2010-10-22 18:33:19 -04:00
481a44104e
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-22 18:33:10 -04:00
004b395d12
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-22 18:27:49 -04:00
170c5d183b
Remove a bit of dead code relating to ObjectCapacity
2010-10-22 18:27:40 -04:00
753137e9ad
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-22 18:27:28 -04:00
6049e548a5
Skip empty strings in ParseString* functions
2010-10-22 18:27:12 -04:00
9fa915bdef
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-23 00:20:18 +02:00
c3ddf46188
Prevent database lookups on every avatar movement when land is set to group
...
access. Fixes a massive performance degradation.
2010-10-23 00:18:56 +02:00
700f4ddea4
Change some exception to use ToString(). e.Message is not sufficient to fix
...
errors. Please don't use e.Message, devs NEED to see the dumps!
2010-10-22 22:55:07 +01:00
cfbaad3669
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 21:28:10 +01:00
1064e743be
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 21:12:22 +01:00
e6019dd6ac
print IAR version number on console when saving
2010-10-22 19:34:06 +01:00
7f2d844916
Implement guard against trying to load incompatible version IARs
2010-10-22 19:30:15 +01:00
199b61f1b2
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 19:24:42 +01:00
a5bb7b8a30
slightly simplify oar control file loading code
2010-10-22 18:47:38 +01:00
bb28726a8b
write IAR control file first in the archive rather than last
2010-10-22 18:39:40 +01:00
301a926015
Change some exception to use ToString(). e.Message is not sufficient to fix
...
errors. Please don't use e.Message, devs NEED to see the dumps!
2010-10-22 13:29:59 +01:00
d4144bedb8
* change the data exchanged within hypergrid transactions
2010-10-21 23:22:15 -04:00
e7f184345e
minor: add some text to the oar abort messages on assets timeout to make it clear that the oar will not be usable
2010-10-22 01:52:19 +01:00
62a0910355
Allow region modules to know which agents actually receive chat
2010-10-22 01:01:56 +01:00
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
529fb58b7b
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-21 12:56:36 -07:00
28c4dd7931
Merge branch 'master' into careminster-presence-refactor
2010-10-21 20:26:29 +01:00
fe99f194ad
Deleted a verbose and unneeded log message.
2010-10-21 12:00:30 -07:00
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
bb78f1c05a
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-21 15:36:32 +01:00
338e7481f9
Remove a bit of dead code relating to ObjectCapacity
2010-10-21 13:21:46 +01:00
fa7da00cc3
COnvert some funky K&R notation to proper (MS) style
2010-10-21 09:35:33 +01:00
01bc4fc9da
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-21 09:30:09 +01:00
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
1f7577b735
Skip empty strings in ParseString* functions
2010-10-21 07:19:10 +01:00
f8a47801ee
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-20 20:43:08 -07:00
9038218c2d
fix combining of multiple physics submeshes
2010-10-20 20:39:05 -07:00
017b83d0a3
* remove some spurious debug info
...
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-20 22:36:29 -04:00
58f75fa19d
* more url / hg cleanup
2010-10-20 22:21:45 -04:00
19119d7705
* additional serveruri cleanup
2010-10-20 22:21:41 -04:00
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
335f2ddad2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 20:26:37 -04:00
b1c8d05888
Major refactoring of appearance handling.
...
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.
AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.
AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.
AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
a7acb650d4
Deleted verbose debug messages that are bringing sims to an halt. Increased the user cache expiration period to 33 hours.
2010-10-19 22:26:07 -07:00
9f975ad5aa
* One more goofy thing. I note that the sculpt texture id is broken out of the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately.
2010-10-20 01:23:54 -04:00
087cb951e2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 00:43:29 -04:00
edce4e9c67
* This removes an ugly extraparams hack that I used and makes UploadObjectAsset into a generic linkset upload tool.
2010-10-20 00:40:05 -04:00
8731c2be11
It looks like Vector3s also got written down in lower case at some point in time. Added code to account for that.
...
17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and instead Line 1, position 2838.
2010-10-19 15:16:29 -07:00
8acac3d07f
Another take related to the previous commit.
2010-10-19 15:07:15 -07:00
3b2d9a9939
Added code to quaternion deserialization to try to cope with an exception seen in Wright Plaza related to SitTargetOrientation.
...
17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064.
2010-10-19 14:37:03 -07:00
684449f783
Added TextureAnimation and ParticleSystem to serialization.
2010-10-19 00:04:02 -07:00
b2c1a1c9bd
* This concludes UploadObjectAsset for now until the permissions and physics shape are added to the message serialization.
...
* You should now be able to upload multiple mesh collada mesh objects. They should appear in front of you (or on top of you!) when you upload them.
* Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D
2010-10-19 01:53:56 -04:00
158e43d4fd
* Almost complete implementation of UploadObjectAsset cap. all meshes get uploaded but they're improperly positioned/oriented at the moment.
2010-10-18 23:47:35 -04:00
12128f1917
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-18 23:00:48 -04:00
37a6be7ca9
Stop the InventoryTransferModule logging every IM notification it receives, even if they are nothing to do with it.
2010-10-19 02:20:47 +01:00
5dd372edc4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:12:36 +01:00
99388ce610
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:08:50 +01:00
478b44f231
Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC groups module
...
This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members
Not sure why this wasn't being done before...
2010-10-19 02:04:23 +01:00
b9bef50852
Display more information when xmlrpcgroupsserver comms fails
...
Improve debugging messages
2010-10-19 02:04:14 +01:00
43a4b7b735
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:23:25 +01:00
8853c21763
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:22:31 +01:00
e0a02d6ca3
Merge branch 'master' into careminster-presence-refactor
2010-10-19 00:52:35 +01:00
5b29b975ee
Comment a spammy debug message in the serializer
2010-10-19 00:51:04 +01:00
7de30cc57b
Change substring matching to prefix matching in region search. This affects
...
both map and login, as they use the same method.
2010-10-18 22:59:00 +01:00
ce3594f7f2
Change substring matching to prefix matching in region search. This affects
...
both map and login, as they use the same method.
2010-10-18 22:58:04 +01:00
551015db63
Alphabetize results on region search by prefix matching
2010-10-18 20:29:00 +01:00
78a6e5489b
Fix merge issues
2010-10-18 20:50:16 +02:00
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
e48ac93803
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-18 19:08:55 +01:00
2be93066da
Bump migration version on LastSeen field so it is actually run
2010-10-18 19:08:26 +01:00
e3bd10829f
remove some cruft from last commit
2010-10-18 04:26:23 -07:00
7fa3335fd5
initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
2010-10-18 04:17:36 -07:00
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
6df4ca7de1
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-17 10:42:04 -07:00
7038f2b406
Deleted all [XmlIgnore] from SOP, since those are meaningless now.
2010-10-17 10:41:38 -07:00
22eff055d4
.NET automagical serialization of SOPs replaced by manual serialization across the board.
2010-10-17 10:35:38 -07:00
06b61b68c7
Adding osFunctions for light projection
...
Set the projection parameters in the host prim ...
osSetProjectionParam(bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Set the projection parameters in a target prim ...
osSetProjectionParam(ikey target uuid,
bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Threat Level very high
Signed-off-by: Melanie <melanie@t-data.com>
2010-10-17 09:52:12 +01:00
9e421868e3
Add missing check for !_projectionEntry
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-16 20:59:18 -04:00
46e5c8e919
Merge branch 'master' into careminster-presence-refactor
2010-10-16 10:52:56 +01:00
e6d0fb0b0e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-16 10:51:44 +02:00
efc555ca22
Actually set the PrivateBinPath in XEngine so relocating the scripts
...
directory works
2010-10-16 10:50:07 +02:00
06d37d06e6
Drop max oar loading version back to 0 from 1
2010-10-16 07:25:55 +01:00
edc31adf95
Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all
...
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
2010-10-16 07:09:13 +01:00
e41b23a1a4
change --old-guids switch on the save oar command line to --version=<x>
...
if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
2010-10-16 05:38:44 +01:00
3df8d8ff76
Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle
2010-10-16 04:59:51 +01:00
1bd4219078
save oar control file first rather than in the middle so that it's the first thing we come accross on load
...
this exposes a weekness with using tar where we don't control the order in which files are loaded. can't be helped for now
2010-10-16 03:52:11 +01:00
fe4e6ff811
Fix test break - TestSerializeXml2() still requires old-guids option
2010-10-16 02:38:46 +01:00
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
1499607215
Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
2010-10-15 17:27:19 -07:00
e039a8c8c2
UPdated the MySql driver to 6.2.4. Also established a much larger MySqlCommand timeout on fetching prims.
2010-10-15 15:43:06 -07:00
dd1058e6b3
Adding projected light filters to prim propeties
...
Requires the LL Mesh Beta viewer
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 09:46:49 -04:00
cd4d7a7c35
A couple of more ways attachment point is sent
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:56:08 -04:00
0308982c58
one more silly line ending thing.... *If you have problems, fetch the tree and rebase.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:45:25 -04:00
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
2d88394cd5
laying some groundwork for mesh physics
2010-10-14 13:10:03 -07:00
486eede9be
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 12:24:07 -04:00
c148ef25a9
* Replacing Magic numbers with Enums
2010-10-14 12:23:41 -04:00
405935492b
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
2010-10-14 16:28:51 +01:00
ba247f729d
Kill some magic numbers in the mesh upload module and change the mesh asset
...
type from 45 to 49 to match OMV trunk
2010-10-14 16:28:51 +01:00
41ce392d9b
Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems to be generating xml's that are successfully parsed. Needs more testing.
2010-10-14 09:05:46 -07:00
05c4e27a30
* A few additional cleanup elements
...
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong.
* Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
2010-10-14 09:57:42 -04:00
6d99f0c627
* Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'
...
* At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that.
2010-10-14 09:34:37 -04:00
7e363b79c7
* Tweaked the upload response and now at least uploading the mesh works.
...
* Binary error on downloading the mesh though.. so still not yet working.
2010-10-14 09:24:15 -04:00
9c5f8a6802
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 03:23:37 -04:00
b4a5ce148c
Rename file + more testing and tweaking
2010-10-14 03:22:44 -04:00
6ac6ca057d
Kill some magic numbers in the caps module
2010-10-14 07:28:20 +01:00
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
45e0cdfcad
Added SOP.MediaUrl and Shape.Media to the deserialization
2010-10-13 15:44:25 -07:00
aa60c4b129
fix build break
2010-10-13 22:18:57 +01:00
537905d81b
Add a setter to OldItemID so it can be deserialized
2010-10-13 19:45:55 +01:00
bb1e35fbd9
Merge branch 'master' into careminster-presence-refactor
2010-10-13 18:44:58 +01:00
eeac2a9e6a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-13 18:41:52 +01:00
ccd5610997
Correctly update the LastSeen field
2010-10-13 18:41:09 +01:00
01728fb19e
Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
...
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-10-13 18:40:33 +01:00
d890390ecf
Comment a debug message so that it doesn't spew the console upon encountering unknown xml elements.
2010-10-13 10:38:34 -07:00
54a3b8e079
New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for load oar and load xml2, but not for packing objects on crossings/TPs yet.
2010-10-13 08:16:41 -07:00
3eb68c319e
change default next owner persm to mod/trans to match SL.
2010-10-13 08:24:18 +02:00
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
0806d03780
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-10 22:08:54 +01:00
cb79e228e4
Merge branch 'master' into careminster-presence-refactor
2010-10-10 22:08:36 +01:00
30f926aab6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-10 22:07:51 +01:00
f2febb89fc
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:07:36 +01:00
2804c97a39
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:06:47 +01:00
c2971a6398
Add group invites to the list of messages that get offlined
2010-10-10 20:15:02 +02:00
cf61cf7b32
* Make line endings consistant in Meshmerizer.cs
2010-10-09 13:50:53 -04:00
0dd4071156
Fix a typo in previouis commit: start must not pass the end of the file
2010-10-09 18:22:21 +02:00
3454dfbcb3
weird line endings fix commit
2010-10-09 12:07:58 -04:00
5e381ec67c
Return error code instead of the last byte of the file if range is not satisfiable
2010-10-09 18:01:11 +02:00
06d3a529a9
In case when 1 single byte is requested (yes viewer does this)
...
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.
End can also be 0, valid request for the firt byte of the file is 0-0.
Thanks to Thickbrick for explaining how HTTP range header works.
2010-10-09 17:46:09 +02:00
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01:00
96080dc492
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-09 01:05:05 +01:00
ed161020e2
minor: remove some mono compiler warnings
2010-10-09 01:46:29 +01:00
211ea5d521
Limit formatting of local console output to actual logging messages.
...
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
2010-10-09 00:47:39 +01:00
ff49a21eca
Fix a security relevant issue with take / take copy
2010-10-09 01:02:57 +02:00
4a57288577
Fix an infinite recursion
2010-10-08 23:23:07 +01:00
4a0911bdbd
Guard against locking a nullref to avoid build break
2010-10-08 19:19:07 +01:00
5dcbbb726a
Change the order of actions to address a possible nullref
2010-10-08 18:40:13 +01:00
52dd547863
Make SendKillObject send multiple localIDs in one packet. This avoids the
...
halting visual behavior of large group deletes and eliminates the packet flood
2010-10-08 11:31:52 +02:00
4adada6fe4
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-07 23:47:39 -04:00
9391c3ffee
add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing
2010-10-07 19:34:46 -07:00
ba0afa53d3
Implement rezzing coalesced objects
2010-10-07 05:12:39 +02:00
9a5d0984a5
Fix autoreturn to not return zero objects
2010-10-07 02:16:36 +01:00
2db0ac74c7
Implement taking of coalesced objects.
...
WARNING!!!!!
You can TAKE them, but you can't REZ them again. Only the first of the contained
objects will rez, the rest is inaccessible until rezzing them is implemented.
Also, rotations are not explicitly stored. This MAY work. Or not.
2010-10-07 01:13:17 +02:00
abfede7819
Plumb the path for multiple object deletes
2010-10-06 20:00:51 +01:00
42f76773a1
Plumb the path for multiple object deletes
2010-10-06 19:59:30 +02:00
ca50f6a82c
Merge branch 'master' into careminster-presence-refactor
2010-10-06 05:45:29 +01:00
d45276b3f6
Add and plumb the usetex URL parameter to worldview. Required but not yet
...
functional
2010-10-06 05:44:19 +01:00
9a1c8db443
Convert worldview to GET
2010-10-06 05:17:31 +01:00
1a47ec082e
Convert worldview to GET
2010-10-06 05:15:47 +02:00
b7586806cd
Merge branch 'master' into careminster-presence-refactor
2010-10-06 03:52:57 +01:00
623f57deb5
Change the URL /worldview to /worldview/<region id> to support multiregion
2010-10-06 03:51:55 +01:00
752b6a8764
Convert the BMP to a JPEG image and return it. This should be testable.
2010-10-06 03:40:55 +01:00
abfcd168fc
Add the parameter plumbing and image generation
2010-10-06 03:32:01 +01:00
17316170a5
Add WOrldView request handler and plumbing
2010-10-06 03:03:10 +01:00
7d62ab6a9e
Fix incorrect class name
2010-10-06 02:16:42 +01:00
ce89f08f6b
Add WorldView module skeleton
2010-10-06 02:06:50 +01:00
c97398575c
Convert the map image modules to new style modules
2010-10-06 01:42:18 +01:00
84cf0ffbf1
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 20:06:27 -04:00
593fc5c87a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 19:45:37 -04:00
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
7e6a047769
Remove defunct sirikata client stack
2010-10-06 00:20:41 +01:00
5d61323192
Add the view generating method to the image generator interface
2010-10-05 23:49:21 +01:00
b424af6187
Revert an accidental default value change
2010-10-05 23:06:29 +01:00
eb491d2c36
Patch to allow other cam angles. Not complete. Thanks, Antont.
2010-10-05 22:56:20 +01:00
8f1acb890a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 14:17:18 -04:00
ba0a19c228
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-05 02:12:35 +01:00
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
eb17d581d3
Make windlight set the default environment on start
2010-10-05 01:54:15 +01:00
e55e93c994
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:28 +01:00
cb6e4035c7
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:09 +01:00
da6816c805
Merge branch 'master' into careminster-presence-refactor
2010-10-04 04:49:54 +01:00
37231e0941
Made the home agent handler check for xff if behind a proxy.
2010-10-03 21:21:02 -07:00
934ae03d44
Made the Gatekeeper proxy-able.
2010-10-03 20:35:26 -07:00
0772e19af2
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
2010-10-03 20:01:59 -07:00
f89dd85f68
Fix a comment marker
2010-10-04 00:17:48 +01:00
766ce9a141
Add linden prim renderer and update libOMV
2010-10-04 00:10:08 +01:00
90f9b7b7c4
Fix line endings
2010-10-04 00:37:18 +02:00
50b03d08a8
Add linden prim renderer and update libOMV
2010-10-04 00:04:42 +02:00
e3099d48f9
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-03 18:04:38 -04:00
69acf9c79b
* additional serveruri cleanup
2010-10-03 18:03:53 -04:00
48988bf4e9
Merge branch 'master' into careminster-presence-refactor
2010-10-03 22:38:32 +01:00
511751a733
I really have to say it again and again: e.Message is NOT enough data for
...
troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must
be used.
Fix one more instance of that cr.p
2010-10-03 22:36:27 +01:00
5910be236f
Merge branch 'master' into careminster-presence-refactor
2010-10-03 16:52:27 +01:00
189cda1c3d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-03 16:51:41 +01:00
0b13cfa4dd
Port ExecutingDirectory from omfOS Util class.
2010-10-03 16:50:50 +01:00
4f70ac018b
Adapt to core changes
2010-10-03 16:40:11 +01:00
27340f616e
Addign the new / renamed files for previous commit
2010-10-03 16:34:55 +01:00
ab4be3ffdf
Initial port of the Warp3D map tile renderer
2010-10-03 16:34:17 +01:00
0133619af2
Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker.
2010-10-02 17:02:02 -07:00
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
662976b602
Merge branch 'master' into careminster-presence-refactor
2010-10-02 20:12:36 +01:00
6fc1ceb2ee
So, the client can have an old idea of the object properties for the object when it goes to buy. This can cause a problem in the buy process. Additionally Hazim mentioned that the buy packets are spoofable. The core modules are the crowing glory example of best practice :P, so therefore, setting the example here, Validate Client sent Buy Data. WebAppSecurity 101, Never trust a client. Validate Validate Validate! Or you'll have problems whether intentional or not.
2010-10-02 20:11:43 +01:00
fd56fd2ce8
Merge branch 'master' into careminster-presence-refactor
2010-10-02 19:51:43 +01:00
87c6386884
Reapplying the parts of the prior revert that were not derived from the
...
original patch
2010-10-02 18:47:26 +01:00
b01020b84a
Revert "Forward-port 0.6 fix"
...
This reverts commit 90b51dc7d6
2010-10-02 18:45:48 +01:00
f220a2c5eb
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:24:16 +01:00
b40c91777c
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:19:30 +02:00
9f7f266f58
Replace CalculateMass with a better, contributed version
2010-10-02 00:18:52 +02:00
2427e16b42
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-01 05:42:42 +01:00
ffc1123ca5
adding -logconfig to Robust.exe
...
Adding -logconfig to Robust.exe. will still process the
-logfile option, as before. No options given, the value
"Robust.log" will be written in the ./bin directory
2010-10-01 05:42:18 +01:00
7ad1b60eca
Enforce region agent limit as set in estate tools
2010-09-30 20:01:55 +02:00
9c6a591ad0
couple fixes to enable profiles in simian connector
2010-09-30 09:59:53 -07:00
521e2c8355
Merge branch 'master' into careminster-presence-refactor
2010-09-30 16:01:45 +01:00
eb58d91098
Prevent dropping someone else's attachments
2010-09-30 15:57:52 +01:00
90b51dc7d6
Forward-port 0.6 fix
2010-09-30 15:52:33 +01:00
29646bcf67
Fix an inventory fetch issue
2010-09-30 02:52:35 +01:00
ac7a4a7d38
Fix an inventory fetch issue
2010-09-30 02:47:07 +02:00
9522881404
Fix a potential key collision
2010-09-30 02:46:47 +02:00
08ee7a0e51
Actually log users out (call LogoutAgent) in the SimianPresenceServiceConnector when LoggedOut() is called
2010-09-29 15:14:13 -07:00
1255c7ceb6
Cleanup: Removed an unreferenced variable from ActivityDetector.cs
2010-09-29 14:39:13 -07:00
b6e0563ad7
Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior
2010-09-29 14:34:02 -07:00
9b7c99f0cf
Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now
2010-09-29 14:24:32 -07:00
3d75e9addd
Lock the iteration over the inventory items when saving script states
2010-09-28 02:22:32 +02:00
841c84831f
Try to prevent threading issues in SP.SetAppearance by locking it
2010-09-27 19:34:16 +02:00
5b2aa02fd9
Merge branch 'master' into careminster-presence-refactor
2010-09-27 03:48:15 +01:00
0339d420e7
Restrict top colliders / top scripts to estate managers
2010-09-27 03:45:22 +01:00
41051b3cc6
Prevent setting arbitrary groups on your objects.
2010-09-27 02:13:22 +01:00
8e547d3491
Prevent setting arbitrary groups on your objects.
2010-09-27 02:11:55 +01:00
c2a4bdb2fe
Fix build break
2010-09-27 01:40:29 +01:00
296cf04ce6
Merge branch 'master' into careminster-presence-refactor
2010-09-27 01:32:06 +01:00
84ab4742c8
Quash the region ID on intersim messages. That prevents people from determining
...
another avatars location
2010-09-27 01:31:17 +01:00
aaa4cb64a4
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-27 00:34:30 +01:00
1f7d68e555
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:30:26 +01:00
34e8bf45b6
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:29:27 +01:00
9f17ae580d
Merge branch 'master' into careminster-presence-refactor
2010-09-26 23:57:06 +01:00
6f78358b09
When receiving intersim IM, don't let the spoof protection bomb
2010-09-26 23:50:55 +01:00
dc49057c8a
Consistency patch: use Path.Combine() instead of + and eliminate the need
...
for a trailing slash on exports/
2010-09-26 20:03:00 +01:00
d0c271adc6
Typo fixes
2010-09-26 18:06:23 +01:00
aecac9bba9
Typo fixes
2010-09-26 18:05:55 +01:00
6f689f591a
Merge Master
2010-09-26 17:56:31 +01:00
b0b4782a2b
adding configurable j2kDecodeCache path
...
allowing the decoded sculpt map cache path to be defined in
the configuration files.
Use DecodedSculpMapPath in the [Startup] section to set
the path. The default is still ./bin/j2kDecodeCache
2010-09-26 17:04:11 +01:00
4f25b73b57
Add configurable path to script engine assemblies
...
Adding ability to place script engine assemblies outside
the codebase directories.
Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies"
Signed-off-by: Melanie <melanie@t-data.com>
2010-09-26 02:30:46 +01:00
0080f28f1d
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:57:53 +01:00
d8ae287ebf
Prevent spoofing the agent name on text IM
2010-09-25 06:56:08 +01:00
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
3b76d7bbb6
Fix a minor economy issue
2010-09-25 06:09:35 +01:00
83b16612ce
Experimental locking of taint processing
2010-09-25 05:57:08 +02:00
30d3e8a13e
Add prim name to OdePrim Error and Warning messages.
...
This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
2010-09-25 01:07:37 +01:00
6325fa515d
Add UUID to physics prim name parameter so that diagnostic messages can be made more useful.
...
If a separate UUID parameter is better for the future then this can be added later on.
2010-09-25 00:51:40 +01:00
b366ad5012
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-25 00:00:00 +01:00
5bcf9ae2f9
If the uuid gatherer fails to find the asset containing gesture metadata, then simply return rather than generating an exception
...
This matches existing behaviour, though better diagnostics for missing assets may be good later on.
This addresses http://opensimulator.org/mantis/view.php?id=4977
2010-09-24 23:58:37 +01:00
1c1f308052
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-24 23:48:52 +02:00
33bd4fe789
When clearing the addin registry, respect a custom path
2010-09-24 22:00:51 +02:00
8dc59f5b59
Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() functions per the LSL wiki.
...
Signed-off-by: Melanie <melanie@t-data.com>
This patch also fixes a large amount of trailing whitespace. While this is
beneficial, it should really be in a separate patch that fixes whitespace only.
Just good practice.
2010-09-24 16:25:14 +01:00
acd5bbdb71
* One more item for CSharpSqlite
...
* Hopefully this will enable mac people to use SQLite again
* Someone cooler then me will need to figure out how to define CSharpSqlite with Mono so the conditional will pick up.
* There's also an error that occurs when you first load OpenSimulator under CSharpSQLite that goes away after.
* The databases are not byte for byte compatible. Mono.Data.Sqlite is able to read CSharpSqlite made databases but not the reverse way.
2010-09-23 01:45:54 -04:00
983c6a74b1
* Add CSharpSqlite to prebuild
...
* Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
* Hopefully, this will restore sqlite functionality on a Mac. In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box. I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
2010-09-23 01:21:08 -04:00
41847e8fdf
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-21 04:03:40 +01:00
9feef34a81
Merge branch 'master' into careminster-presence-refactor
2010-09-21 04:03:14 +01:00
2b8c99c2fb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-21 04:02:50 +01:00
14adf90805
Fix a typo
2010-09-21 04:02:34 +01:00
10a37f5be4
Refactor script create permission into the perms module
2010-09-21 04:02:28 +01:00
12f9b1df8c
Fix a typo
2010-09-21 03:57:09 +02:00
7229bc4fbd
Refactor script create permission into the perms module
2010-09-21 02:08:55 +02:00
51207c24a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:04:08 +01:00
192bcab987
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:01:07 +01:00
a85779e477
If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the scene, remove the old uuid reference from m_parts as well as adding the new one.
...
The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene)
Added unit test for this behaviour.
Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error.
2010-09-21 00:58:54 +01:00
9cf8795ecf
Fix a merge artefact that broke script state persistence in XAttachments
2010-09-19 22:53:05 +02:00
27d5976b87
* Tweaked the LocationTests for maximum coverage.
...
* Added more mundane tests.
2010-09-18 03:42:37 -04:00
c203fae26b
* Covered the type converters in SLUtil with unit tests.
...
* Does anyone have an example raw notecard to look at and test the notecard parser?
2010-09-18 02:49:42 -04:00
4d83879704
* More Mundane Tests
...
* SL Util tests of AssetType2ContentType and ContentType2AssetType
2010-09-17 23:27:41 -04:00
a22f007246
Improve the explanative text of migration failures
...
When running for the first time, people see migration failures because of sql statements that are trying to move data from old tables (e.g. users). The amended text attempts to calm their nerves.
2010-09-18 03:37:10 +01:00
7ee0a8d30e
Clarify help text for use of file paths with console command "create region".
2010-09-18 02:30:56 +01:00
cd42cdcc89
REST Console delivers responses with content type text/xml instead of text/plain.
...
Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
2010-09-18 02:24:04 +01:00
2501372d3b
Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman
...
Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe
2010-09-18 01:57:13 +01:00
889923841c
Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars
...
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
2010-09-18 01:43:22 +01:00
4327c795f8
Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
...
I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't
2010-09-18 00:25:22 +01:00
b1ab3ea5d9
For all Flotasm group module XMLRPC calls, correct parameter requestingAgentID to RequestingAgentID
...
This was stopping the get group member roles call from working, and may have affected other things
2010-09-17 23:48:44 +01:00
33fbf0e329
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-09-17 18:41:29 -04:00
94f35890e7
* Fixed and re-enabled CacheTests
...
* Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework.
* Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet)
2010-09-17 18:41:12 -04:00
3a760ad12b
Overwrite the core version of the string parsing method with ours
2010-09-17 22:20:20 +01:00
bdd4dcf69b
Merge branch 'master' into careminster-presence-refactor
2010-09-17 22:12:48 +01:00
c08b6c2873
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 14:35:35 -07:00
e603521fd7
Applying the llParseString2List() patch from #5036 that Melanie claims was already applied
2010-09-17 14:32:49 -07:00
69749b81f9
* Add a few more tests to help our meager code coverage %.
...
* Tests Animation Constructors
* Tests Animation OSD Packing/Unpacking
* Tests the PrimeNumberHelper class which is used in the cache.
2010-09-17 03:11:57 -04:00
256c8cb62d
Send kill packets for avatars, too
2010-09-17 03:56:31 +01:00
87a1e00f05
Remove the now unused partslock
2010-09-17 04:00:00 +02:00
e32855d080
Merge branch 'master' into careminster-presence-refactor
2010-09-17 03:57:15 +01:00
7df4383235
Merge branch 'master' into careminster-presence-refactor
...
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
2010-09-17 03:49:30 +01:00
7762301cea
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:57:26 +01:00
b49cb3355f
Fixed a regression in SOG.Copy()
2010-09-16 17:57:00 -07:00
5321e0e69f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-16 17:31:24 -07:00
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
e3f1533705
Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}
2010-09-17 01:21:28 +01:00
5072429263
Send KillPackets on the Task queue rather than the State queue
...
Object updates are sent on the task queue. It's possible for an object update to be placed on the client queue before a kill packet comes along.
The kill packet would then be placed on the state queue and possibly get sent before the update
If the update gets sent afterwards then client get undeletable no owner objects until relog
Placing the kills in the task queue should mean that they are received after updates. The kill record prevents subsequent updates getting on the queue
Comments state that updates are sent via the state queue but this isn't true. If this was the case this problem might not exist.
2010-09-17 01:16:21 +01:00
5b18f8be25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 01:01:12 +01:00
251f2444d0
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:50:48 +02:00
670357367e
Removing debug
2010-09-16 23:32:18 +01:00
1b2edfe75f
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:19:46 +01:00
1e4e978f7f
Removing debug
2010-09-16 23:26:53 +02:00
a0c87b5af6
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:12:32 +02:00
d52b2b9ee7
minor: remove some mono compiler warnings
2010-09-16 20:46:24 +01:00
512ded6eb5
Catch a nullref
2010-09-16 21:07:09 +02:00
d50a072336
Suppress the strange "Result not Dictionary" messages that happen when
...
a region queries for a nonexistent presence.
2010-09-16 20:21:30 +02:00
ec89dc99b7
Some small bug fixes
2010-09-16 18:58:25 +02:00
58b1ee8e2c
Merge branch 'master' into careminster-presence-refactor
2010-09-16 18:04:50 +01:00
7383173d3d
extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() to reduce scope for kill/update race conditions
...
This is necessary because it was still possible for an entity update packet to be constructed, the thread to pause, a kill to be sent on another thread, and then the original thread to resume and send the update
This would result in an update being received after a kill, which results in undeletable ghost objects until the viewer is relogged
Extending the lock looks okay since its only taken by kill, update and reprioritize, and both kill and update do not take further locks
However, evidence suggests that there is still a kill/update race somewhere
2010-09-15 23:06:38 +01:00
e6bc77d832
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-15 23:03:02 +01:00
39d27fc879
rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability
2010-09-15 22:29:58 +01:00
16f296f489
Instead of locking SOG.Children when a group is being removed from the scene, iterate over an unlocked list instead
...
Previously, deadlock was possible because deleting a group took a SOG.Children lock then an m_entityUpdates.SyncRoot lock in LLClientView
At the same time, a thread starting from LLClientView.ProcessEntityUpdates() could take an m_entityUpdates.SyncRoot lock then later attempt to take a SOG.Children lock in PermissionsModule.GenerateClientFlags() and later on
Taking a children list in SOG appears to be a better solution than changing PermissionsModule to not relook up the prim. Going the permission modules root would require that all downstream modules not take a SOG.Children lock either
2010-09-15 21:51:13 +01:00
571693d7b6
Revert last commit
2010-09-15 08:16:38 -07:00
77eb8ade8c
Don't throw an exception if the authorizationservice is missing a serviceuri config entry. Not every authorization service will need a URI.
2010-09-15 08:08:29 -07:00
1f74f013b2
Don't fart when deserializing a prim with no ParentGroup set yet
2010-09-15 07:59:28 -07:00
3275fbec54
Fix the above
2010-09-14 23:06:44 +01:00
7f7bbbb84a
Fix the above
2010-09-14 23:05:42 +01:00
18beb796bc
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:50:38 +01:00
585e575d23
Allow to place the connection strings and providers for estate and region
...
in their oqn sections, for those of us who don't want a catch-all
DatabaseService section.
2010-09-14 22:47:45 +01:00
8ed08a10d9
Remove long unused Region/Framework/ThreadTracker
...
All methods had already been deleted, only GetThreads() was left
2010-09-14 22:34:55 +01:00
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
540a1912ce
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-14 22:14:23 +02:00
356b1ef1d9
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:16:02 +01:00
e27f59cf42
reorder some code to avoid merge issues in the future
2010-09-14 22:15:16 +01:00
2f41bc4ca7
Fix merge issues
2010-09-14 22:14:08 +01:00
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
cc290abf7a
Adjust the code for ghost prim removal to new information from Kitto
2010-09-14 22:13:44 +02:00
d299f8b55c
Fix a small left over buglet and also add checking of the physics actor
...
position on backup. This way, ant object that has been moved will be
checked for ghost prims as soon as it is persisted.
2010-09-14 19:41:53 +02:00
095d400f5b
fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that OpenSimDefaults.ini is present
...
this should allow the testsuite to run again and the autobuild to complete
2010-09-14 17:01:53 +01:00
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
2010-09-14 03:30:07 +01:00
ec305a4825
LSL compatibility: Don't throw an exception if an invalid key is passed to llInstantMessage, instead shout about it and apply the usual delay. This now matches SL.
2010-09-13 17:43:45 -07:00
c3259e9c26
Move OpenSimDefaults,ini into config-include in order to put it with all the other default files
2010-09-14 01:38:53 +01:00
b2e50474dc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:35:27 +01:00
36f81c66e5
Comment out SOG storing debug log message
...
This can get very spammy with regularly changing objects. Please uncomment if required.
2010-09-14 00:05:38 +01:00
96a2ce5db0
Add a missing parenthesis
2010-09-13 23:33:55 +01:00
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
4aadfc3007
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:27:56 +01:00
2cf98e77fc
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:27:47 +01:00
8febba7717
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:27:31 +01:00
656e64b3ed
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:22:25 +01:00
8e51ca3a7b
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:17:42 +01:00
5e1aab92f5
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:12:48 +01:00
dd803b4f0c
minor: Add comments which explain what's going on wrt avatar movements at various points in the main scene loop and associated methods
2010-09-13 21:53:25 +01:00
fbe72e30eb
Improve generic message exception logging. Quieten down complaints about unhandled GenericMessages
2010-09-13 21:52:36 +01:00
e4858b0eeb
Add client name to packet resend log messages to make them a bit more informative
2010-09-13 21:29:04 +01:00
7ae9266186
Remove SceneGraph.DetachObject() which was accidentally left around after being migrated to AttachmentsModule
2010-09-13 21:20:31 +01:00
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
cd153a20b7
Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface
...
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
2010-09-13 21:05:03 +01:00
366de0a7b5
If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory
...
Doing this results in a null reference exception
2010-09-13 20:58:50 +01:00
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
5ef2da39d8
* Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers)
2010-09-13 11:23:45 -07:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
18a9ac6b39
Fix unit test SceneSetupHelpers to load the mock simulation data store
2010-09-12 15:04:51 -07:00
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
20cd1da6bf
Add copyright headers.
2010-09-12 12:54:31 -04:00
16d782eaa2
Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
2010-09-12 00:30:13 -07:00
007912d6f4
Shuffling fields and properties around in Scene to make Scene.cs more readable
2010-09-11 23:41:48 -07:00
e2544584ad
Changed all string references of "IRegionDataStore" to "ISimulationDataStore"
2010-09-11 22:02:34 -07:00
109b517583
Fixed the naming mess around data connectors for simulation data
2010-09-11 20:43:06 -07:00
47ac9f97b1
Re-enabled asset last access time logging in MySQL
2010-09-11 18:29:38 -07:00
47a5e2633c
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:24:14 +01:00
d264f0d301
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-11 20:22:53 +01:00
5e5260ad1b
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:22:10 +01:00
220f82a0f0
Make it clear that the "create region" command will reference ini files in the regions directory (usually Regions/)
...
Also convert some tabs into spaces.
2010-09-11 00:27:52 +01:00
30306a775a
Made it impossible to create a user with names containing spaces and prevented passwords from being echoed after enter is pressed.
2010-09-10 23:19:18 +01:00
a7f4e10f42
Remove parenthesis around the release flavour to get the version string back under 27 chars
...
Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client
2010-09-10 21:56:04 +01:00
b597a295c4
Second pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:41:36 -07:00
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
9609faa8eb
* Run SimianGrid session updates asynchronously instead of from the main heartbeat thread
...
* Minor dead code cleanup
2010-09-09 15:05:22 -07:00
8415b98806
Over a dozen thread safety fixes in FriendsModule
2010-09-09 14:45:10 -07:00
972ef92590
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 15:09:34 -07:00
5dc9ea2f24
* Changed 11 calls for session info to the more optimized API method
2010-09-08 15:08:49 -07:00
ae6682036d
Made the HG asset and inventory brokers use the Helo service in order to instantiate the right network connectors. Tested on Robust only.
2010-09-08 14:13:01 -07:00
d301f3fd6a
Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
2010-09-08 14:12:01 -07:00
8cc3d60e59
Added constructor that takes an URL to asset and inventory simian connectors.
2010-09-08 14:09:43 -07:00
3fb4a17f10
No need for a config var for the HELO message on the server-side. It's robust.
2010-09-08 11:30:38 -07:00
904d6b787a
First version of the Hypergrid HELO service that will enable different backends to interoperate.
2010-09-08 09:53:57 -07:00
b8d14fcc4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 01:05:56 +01:00
319007783c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-08 00:50:31 +02:00
7a1b1dd419
Make AddRestoredSceneObject reset the IsDeleted flag so we can take an
...
object out of the scene and then put it back in.
2010-09-08 00:49:32 +02:00
0bebe94231
Rolling back the recent libomv update but keeping the ExpiringCache cleanups (as much as is possible). There was a report of non-finite avatar positions after the update
2010-09-07 15:45:33 -07:00
9be1c0ff44
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
...
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
2010-09-07 14:41:13 -07:00
587bab79b4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 13:43:52 -07:00
029c954804
* Added sanity checks to the SimianAssetServiceConnector so it will throw a sensible error message when it is misconfigured instead of a mysterious "Uri is empty" error
2010-09-07 13:43:36 -07:00
b28d1b6ccd
Fix Simian regression
2010-09-07 20:21:05 +01:00
342c64b7ac
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-07 20:20:16 +01:00
50cc22c9e6
Fix Simian regression
2010-09-07 20:19:52 +01:00
5ca4c238e0
SimianUserAccountServiceConnector was not initializing the user cache
2010-09-07 11:33:46 -07:00
8ab4b277c1
Fix some issues with unlinking
2010-09-07 17:12:28 +02:00
2684ca0838
Merge branch 'master' into careminster-presence-refactor
2010-09-07 11:51:26 +01:00
8fda08d858
Make sure unlinked child prims get persisted
2010-09-07 11:48:28 +01:00
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
84ad9e4d4e
minor: comment out some excessive test logging
2010-09-07 02:05:44 +01:00
90cd035693
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 02:01:38 +01:00
3284356bba
Merge branch 'master' into careminster-presence-refactor
2010-09-07 01:48:00 +01:00
99bfb0d2a2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-07 01:45:08 +01:00
3d033520fa
Fix deletion persistence when freshly delinked prims are removed
...
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:43:20 +01:00
11f4a65f42
Fix deletion persistence when freshly delinked prims are removed
...
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:12:06 +01:00
e55f6d47e9
Add test that checks correct persistence when an unlink is quickly followed by deletion of a linked part
...
This test is temporarily not running since it currently fails due to a bug in this area
2010-09-06 23:28:52 +01:00
ab875b32c1
Make console backup command do a forced backup rather than non-forced
...
Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
2010-09-06 23:12:03 +01:00
537fefa3f2
extend TestNewSceneObjectLinkPersistence() to check for presence of non-root linked prim
2010-09-06 23:06:23 +01:00
953b7f4917
Add test to check persistence of newly added pre-linked objects
...
Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate
NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead.
2010-09-06 23:00:24 +01:00
cfaefad754
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-06 21:45:17 +00:00
c719e016ed
Falling animation fix, comment out instrumentation.
2010-09-06 21:45:07 +00:00
36cb6208b5
Fix yet another cause of "Ghost attachments"
2010-09-06 22:08:15 +01:00
8886afd319
Fix yet another cause of "Ghost attachments"
2010-09-06 21:59:52 +02:00
f4f9a2cb45
Don't turn off the sale settings on child prims when linking, and on copy
...
of prims anymore. The behavior now matches SL and can be used to link
vendor prims for transport
2010-09-06 18:14:24 +02:00
06adbc1324
Revert "Workaround for mono bug #312968"
...
This reverts commit f2e343d530
2010-09-06 17:24:10 +02:00
f2e343d530
Workaround for mono bug #312968
2010-09-06 14:09:46 +02:00
0246edc2ea
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 04:09:51 +01:00
00a23eea0e
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 03:59:48 +02:00
b9c20fbaa7
Merge branch 'master' into careminster-presence-refactor
2010-09-05 19:15:49 +01:00
7f9f9f9246
Fix a handful of copypaste errors
2010-09-05 19:14:45 +01:00
1b770d3afc
Change UserAccountService to match
2010-09-05 19:09:30 +01:00
4243701d22
Make Simian profiles respect the module chosen in [Profile]
2010-09-05 19:06:50 +01:00
55d3c98917
Fix up presence connector in SimianGrid
2010-09-05 18:24:16 +01:00
0ca48b2486
Fix up Simian inentory
2010-09-05 18:14:31 +01:00
b2486df67c
Friends works differently, it' snot even a region module at all, but a connector
...
that is loaded by the core friends module. Change Simian to match.
2010-09-05 18:06:42 +01:00
1238b27d64
And the avatar services :)
2010-09-05 17:53:15 +01:00
a407ad38f6
Add the m_Enabled pattern to Simian Auth
2010-09-05 17:44:02 +01:00
d9e9c41e13
Add m_Enabled pattern to SimianGridConnector
2010-09-05 17:34:51 +01:00
4025b85a07
As an exmple, add the code to disable connectors intot he simian asset
...
connector
2010-09-05 17:24:05 +01:00
64ec14c8c4
Add missing IDwellModule interface
2010-09-05 17:08:57 +01:00
09c75b30f3
Fix build break
2010-09-05 16:45:24 +01:00
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
e593607171
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:16:42 +02:00
68f107b27e
Logout the presence if client IP verification fails.
2010-09-04 18:46:27 -07:00
953a487f5e
One more debug message to track an issue on Danger grid.
2010-09-04 18:09:17 -07:00
9fd9836841
Make User Agent Service and Login Service separable.
2010-09-04 16:39:03 -07:00
c0b16f09bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-04 01:38:11 +01:00
1e8e98a07f
Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
...
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
107052b23d
Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
...
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
2010-09-04 00:09:53 +01:00
d4b572d2a5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 23:29:59 +01:00
63617c79d8
minor: remove mono compiler warnings
2010-09-03 23:29:39 +01:00
1e552e88e8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 14:50:42 -07:00
fc062a23af
Make SimianFriendsServiceConnector initialize like the other connectors and gracefully handle the case where it is loaded but disabled #monoaddinslol
2010-09-03 14:50:26 -07:00
b8da15c104
In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
...
This is a patch from http://opensimulator.org/mantis/view.php?id=4973 . Thanks randomhuman
2010-09-03 22:38:40 +01:00
9b95bd259f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 22:27:01 +01:00
fe63fad394
minor: remove mono compiler warning
2010-09-03 22:26:15 +01:00
83f6550bcc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:37:30 -07:00
aadbffffb1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:36:59 -07:00
4f79143f3f
* Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to handle initialization as graceful as possible with the current broken way region module initialization is done
...
* Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
2010-09-03 13:36:35 -07:00
d6deebdd63
Add another variant of password hash construction to SimianAuthenticationServiceConnector.CheckPassword()
...
This might be unique to the inventory archiver password check, though at the time it was written, hash construction there should have been identical to other parts of opensim
This is from patch http://opensimulator.org/mantis/view.php?id=4983 . Thanks cmickeyb.
2010-09-03 21:34:31 +01:00
8d2e8b7d5c
minor: remove mono compiler warnings
2010-09-03 21:28:57 +01:00
71c0fc10df
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 21:14:23 +01:00
8daea4d7c0
llRot2Euler Tests
2010-09-03 21:11:13 +01:00
5cbc4e2a5f
Merge branch 'master' into careminster-presence-refactor
2010-09-03 19:18:03 +01:00
0a0f38b23c
Last+2 tweak
2010-09-03 10:31:16 -07:00
a5cce8d6d7
Last+1 tweak.
2010-09-03 10:13:41 -07:00
5bbf793f9e
One last tweak, hopefully.
2010-09-03 10:01:18 -07:00
77384eb28b
Another tweak. Sux^2
2010-09-03 09:26:33 -07:00
85e9160552
More tweaks related to my previous commit. Tweaks sux.
2010-09-03 09:02:08 -07:00
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
18213d26ec
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-03 03:27:47 +01:00
17a26c3701
Fix an issue with rezzing scripted objects.
2010-09-03 03:27:26 +01:00
457160afc3
Fix an issue with rezzing scripted objects.
2010-09-03 03:16:08 +02:00
21c5377af9
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-09-02 16:36:43 -07:00
d96f5fa57d
Quick fix for making global references for gatekeepers that are not domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now.
2010-09-02 16:36:05 -07:00
24c73aa8b2
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-02 21:51:27 +00:00
16814dd8f1
Fixes to JUMP system.
2010-09-02 21:51:19 +00:00
1c8bc9b7b6
Remove commented code and the comment, as the change has proven out
2010-09-02 21:02:09 +01:00
7720419fc7
Experimentally comment the sending of unbaked avatars
2010-09-02 20:17:49 +01:00
ed72396d9b
Show when appearance is sent to an avatar to help track down failure
...
\to display avatars
2010-09-02 19:59:12 +01:00
5ea979d515
Remove commented code and the comment, as the change has proven out
2010-09-02 20:51:27 +02:00
eea5d8368a
Experimentally comment the sending of unbaked avatars
2010-09-02 20:08:39 +02:00
713c666827
Show when appearance is sent to an avatar to help track down failure
...
\to display avatars
2010-09-02 19:49:42 +02:00
7128e1a4ba
Implement UploadBakedTexture cap
2010-09-02 16:20:44 +01:00
0f40ec5c65
Implement UploadBakedTexture cap
2010-09-02 16:10:44 +02:00
db015963a9
Remove the annoying "Script saved" popups when saving scripts in task
...
inventory. They cause spam when using recompile scripts in selection
and are redundant because that message is also shown in the script window
message pane. These popups were a legacy from when we couldn't drive the
message pane and their finest hour has now come.
2010-09-02 14:17:33 +02:00
bbdf6cab50
Fix cast issue
2010-09-02 00:20:57 +01:00
203b7de266
Allow increasing the version in system folders
2010-09-02 00:04:17 +01:00
7efe7feef5
Update: Allow the version to increase only
2010-09-02 00:02:07 +01:00
93edc75147
Disallow modification of system folders. Prevent changing the type of folders
...
and prevent resetting the version number
2010-09-02 00:00:54 +01:00
b9db495d91
Fix sqlite migration problems by moving migrations in 019_RegionStore.sql and 020 into RegionStore.migrations
...
This shows that panda is still not running the sqlite database tests since this change fixes the test failure in that area when "nant test" is executed locally
2010-09-01 22:06:56 +01:00
09fba16094
Prevent Meta7 plants from being treated like dropped attachments and removed
...
from the sim.
2010-09-01 20:10:44 +02:00
2232e6f273
Improve sim health reporting. Output error message if heartbeat thread is restarted by scene. This may help to find out why this recovery mechanism isn't working.
2010-09-01 14:08:52 +02:00
6cbf66827b
refactor: move SOG.AttachToAgent() into AttachmentsModule
2010-09-01 01:11:52 +01:00
c947a67b23
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-01 00:17:23 +01:00
c47de94263
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:36:46 +01:00
01276ef433
refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly
2010-08-31 22:22:45 +01:00
9c1c378aa1
Add ScenePresence.GetAttachments(uint attachmentPoint)
2010-08-31 22:16:23 +01:00
aca10cb027
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-31 22:26:17 +02:00
b973fe5297
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:24:11 +02:00
b8c58e5f9f
reinsert functionality to debug log more levels of incoming and outgoing client protocol packets
...
These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets)
This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
2010-08-31 18:27:10 +01:00
7b03cb09e4
minor: Add some method doc to BaseHttpServer.HandleRequest()
2010-08-30 22:33:45 +01:00
dd14c539af
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-30 21:24:08 +01:00
3cd7761d65
Report exception message as well as stack trace if a region fails to register with the grid service in grid mode
2010-08-30 21:23:19 +01:00
35d6181b78
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-30 11:42:17 -07:00
4cf5ef3cd4
Kick the user from the region in the circumstance that the TP home failed - ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable.
2010-08-30 11:41:20 -07:00
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
8ee31d97a8
Remove CRLF endings
2010-08-30 02:19:21 +01:00
eefb207c1b
Fix a casting operation to use ToString()
2010-08-30 02:10:11 +01:00
0a83fde85c
Implements parcel media setting persistence and packet / CAPS handling
...
properly for the new media settings.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
374807d194
Replace hardcoded 0 with KickFlags provided by the client.
...
This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed. Thanks Revolution.
2010-08-28 02:45:28 +01:00
83fbf66444
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-28 02:41:00 +01:00
def6b1544f
very minor log message and var name tweaking for iar saving
2010-08-28 02:40:21 +01:00
0f95cd209e
Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning
2010-08-27 17:25:04 -07:00
1c0b4457cd
Improve liveness by operating on list copies of SOG.Children where appropriate
2010-08-28 00:40:33 +01:00
4f9931ec10
minor: reduce log chattiness of "load iar" for IARs with lots of folders
2010-08-27 23:23:55 +01:00
86937d0a0f
allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before)
2010-08-27 23:22:49 +01:00
b4278510f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-27 22:53:02 +01:00
8f875700ef
refactor: Make IAR tests set up standard iar for loading
2010-08-27 22:52:26 +01:00
1f1d72eba5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-26 23:39:20 +01:00
5b4e0b72bc
Send a null result search packet when no results are passsed in
2010-08-26 23:38:35 +01:00
436fdc2ea8
More on mantis #4985
2010-08-26 14:48:29 -07:00
6198fe53e6
Addresses mantis #4985 -- exceptions in DataSnapshot
2010-08-26 14:19:52 -07:00
fb6d761e19
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-26 22:13:46 +01:00
7f5501d3ab
minor: remove mono compiler warning
2010-08-26 22:13:31 +01:00
2b0f924557
refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments
2010-08-26 22:09:52 +01:00
f3f4428700
refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule
...
This allows region modules to change attachment positions.
2010-08-26 21:50:19 +01:00
8571a55d29
minor: change log message from info to debug
2010-08-26 20:42:56 +01:00
26fd673e20
Addresses mantis #4984 -- Datasnapshot exceptions.
2010-08-26 12:26:09 -07:00
df702417dc
Remove mono compiler warnings
2010-08-26 16:27:41 +01:00
d99c60164d
Reinstate kill record check that prevents an entity update being sent to a client after it has been told that the entity has been deleted.
...
On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog.
This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted.
2010-08-26 16:06:34 +01:00
a6869fbc3e
Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()
...
By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
2010-08-26 15:33:42 +01:00
87a6554d4b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Resolve merge conflicts
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2010-08-26 00:35:03 +01:00
692cf3c657
Remove parts locking from data classes since these are using a copy of the scene object
2010-08-26 00:17:26 +01:00
166ab59420
replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is always 0 (and any other number would cause an error anyway)
2010-08-26 00:15:26 +01:00
8031f8ec09
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
2010-08-26 00:08:53 +01:00
47818a2db3
Fix a horrible bug in SG, where iteration of scene objects is carried
...
out in a fashion that causes the delegate to be invoked once per child
prim for a given group.
2010-08-26 01:06:50 +02:00
4b47008d30
Correct whitespace
2010-08-26 00:37:54 +02:00
fc8d2be632
Merge branch 'master' into careminster-presence-refactor
...
This was rather conflicted. Please test linking.
2010-08-26 00:11:07 +01:00
252e159340
Merge branch 'master' into careminster-presence-refactor
2010-08-25 23:22:23 +01:00
75e2a2b3ce
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:19:55 +01:00
604423d52b
Make scene object directories more robust and prevent deleted SOP's from
...
sticking around
2010-08-25 23:19:30 +01:00
739eb14741
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:18:15 +01:00
22fd00b002
minor: remove mono compiler warning
2010-08-25 23:07:43 +01:00
24d06b12c2
If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID
...
Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
2010-08-25 23:05:54 +01:00
46c6c35d48
refactor: Push item retrieval and fixing part of Scene.RezObject() down into SceneObjectPartInventory
2010-08-25 22:46:49 +01:00
1096f43f0d
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:34:39 +02:00
dc1baf8025
Change object cleanup again. Make scene object directories more robust and
...
prevent deleted SOP's from sticking around
2010-08-25 23:11:00 +02:00
1bcb2e788f
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:04:12 +02:00
c13045b25e
Correct a logic error in attachment cleanup
2010-08-25 20:11:47 +02:00
314d1171ef
Lock the attachment cleanup so it doesn't go into an endless deletion frenzy
2010-08-25 16:06:06 +02:00
d69e992665
Split out actual scene object insertion code from Scene.Inventory.RezObject and move into SceneGraph.AddNewSceneObject()
...
The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages.
This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module
This code does not touch direct rez by a user
2010-08-24 23:25:19 +01:00
78f452050a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-24 22:29:32 +01:00
07d5a0779a
refactor: make RezObject() more readable
2010-08-24 20:53:25 +01:00
ef5b628191
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-24 19:22:00 +01:00
7296286267
Merge branch 'master' into careminster-presence-refactor
2010-08-24 19:20:43 +01:00
a7a45cb22c
Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attachments.
...
This fixes Mantis #3923 .
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-24 19:19:26 +01:00
4e324ae3cb
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-08-24 19:07:42 +02:00
512a13dbe7
Call the Cleanup when an agent logs out, when an agent leaves and just
...
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-08-24 18:52:00 +02:00
5a05de0eec
Call attachment cleanup when an agent crosses out
2010-08-24 18:38:54 +02:00
483fc88b07
Merge branch 'master' into careminster-presence-refactor
2010-08-24 17:37:11 +01:00
b9e12ed3b7
Add a method to delete left over / dropped attachments
2010-08-24 18:20:24 +02:00
46d06b6c4c
add test to check move of task item to user inventory when a target folder is explicitly given
2010-08-24 17:10:52 +01:00
8bb073d99a
minor: stop test using obsolete property
2010-08-24 17:06:04 +01:00
35f719ae2f
refactor TestMoveTaskInventoryItemNoParent()
2010-08-24 17:04:54 +01:00
289c21099c
Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
...
Also removes some mono compiler warnings
2010-08-24 16:50:31 +01:00
de85aabcbe
Plumb the region type through to the ProductName field in estate messages
2010-08-24 12:41:21 +01:00
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
c72d298202
Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem.
2010-08-23 23:25:36 +01:00
1d01c91095
minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs
2010-08-23 23:21:44 +01:00
704a53fb9b
Fix bug in llGiveInventory() where items were disappearing on relog
...
This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set
This may have been broken since commit bd49985a
2010-08-23 23:16:48 +01:00
74e5fe5aa9
Remove various warnings and improve logging messages. No functional changes.
2010-08-23 22:24:23 +01:00
8a1640f0a1
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-22 09:32:49 -07:00
46412f4931
Fix llGetLinkKey and llGetNumberOfPrims to play nice with avatars in the linkset (emulated)
2010-08-22 09:32:40 -07:00
5c368c8d38
Refix the fix
2010-08-22 16:44:22 +02:00
0ca771c185
Provide a better implementation of llList2Float
2010-08-22 16:23:36 +02:00
98b2d3a7f2
Revert "Fix a typecasting issue in llList2Float. This addresses mantis #262"
...
This reverts commit 810840b862
2010-08-22 15:55:23 +02:00
32ddeab5e3
Add printing the default script engine name. Report real exceptions when
...
there is an issue with the config file, as a typo could cause configuration to
silently fail.
2010-08-22 14:26:58 +02:00
071edaff49
Suppress error messages about scripts not foind if they're in fact disabled
2010-08-22 13:51:15 +02:00
a0a25bb8ca
A stab at making a better bounding box calculation
2010-08-22 13:42:29 +02:00
f445659dd3
Finally putting estate_settings.xml to rest. There will be no more attempts
...
to read or write this file.
2010-08-21 17:38:47 +01:00
954329ec85
Don't allow oversized search reply packets
2010-08-21 17:30:41 +01:00
8613336674
Don't allow oversized search reply packets
2010-08-21 17:48:49 +02:00
3ffdadef70
Add support for attached avatars in llGetLinkKey()
2010-08-21 07:22:41 -07:00
839b08c32b
Removed the NotImplementedException from llSetSoundQueueing, because the function not working won't actually stop the script from working, firing an exception will.
2010-08-21 06:30:53 -07:00
f8ff98577e
Merge branch 'master' into careminster-presence-refactor
2010-08-21 00:32:26 +01:00
ea1df09fa4
Forward-port a small improvement to the land out connector
2010-08-21 00:29:27 +01:00
f7c4be1fa1
Forward-port a small improvement to the land out connector
2010-08-21 00:46:16 +02:00
c448151f6b
Someone from germany broke the build :P mentioning no names
2010-08-20 11:38:59 -07:00
5155915de1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-20 19:36:04 +01:00
7aad5af498
Some code cleanup for console command "create region".
...
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
2010-08-20 19:35:52 +01:00
4463ebfbc2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-20 11:09:21 -07:00
f347d25675
Unit test breakage fix.
2010-08-20 11:09:02 -07:00
86a61696d7
minor: remove mono compiler warning
2010-08-20 17:58:02 +01:00
4708083434
Use the database mthod directly to delete items in a single sql swoop
2010-08-20 18:53:33 +02:00
b1790ba56e
Delete items as well as folders in XInventoryService.PurgeFolder - this should make emptying the trash work properly.
2010-08-20 11:25:31 -07:00
187ccd72f0
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-20 11:01:03 -07:00
cc8864b0e3
Get maturity level from access number. This addresses mantis #269
2010-08-20 11:00:14 -07:00
bb5dd9fbbc
Some code cleanup for console command alert.
...
Made parsing of parameters more robust.
Allow general alerts without specifying keyword 'general'.
Extended help texts.
2010-08-20 17:53:21 +01:00
6f83b0ee46
Cleaned up a few more things related to incoming agents.
2010-08-20 09:02:05 -07:00
82abaadd55
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-20 08:36:54 +01:00
ae554a48d0
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:36:23 +01:00
47838e5fb3
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:46:46 +02:00
b4e7c62fbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-19 19:55:03 -07:00
a39ea07158
Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
2010-08-19 19:54:40 -07:00
1955b79759
Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer.
2010-08-19 18:55:30 -07:00
1ab631f015
Merge branch 'master' into careminster-presence-refactor
2010-08-19 20:25:17 +01:00
f639a9e5ae
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 20:24:46 +01:00
22fdd7b1f1
Short-circuit the grid server lookup for RequestSimulatorData if the region
...
info is requested for is the local region
2010-08-19 20:24:34 +01:00
a1074cad5c
Short-circuit the grid server lookup for RequestSimulatorData if the region
...
info is requested for is the local region
2010-08-19 20:41:55 +02:00
2b172bef72
Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."
...
Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way.
This reverts commit e47608fc62
2010-08-19 09:14:20 -07:00
77705145a0
Merge branch 'master' into careminster-presence-refactor
2010-08-19 11:47:50 +01:00
ee7c799699
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 11:46:07 +01:00
f58a809536
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 11:45:56 +01:00
1a8a11140c
Revert "Adding Group managment to the offline system"
...
This reverts commit 7c673c79d4
2010-08-19 12:04:46 +02:00
fdc59ee802
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-19 12:02:26 +02:00
0344395776
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 12:01:40 +02:00
7c673c79d4
Adding Group managment to the offline system
...
Sending a group invite is offlined now
2010-08-19 08:31:51 +00:00
d547007e73
Improve some logging in LandConnector
...
This also eliminate the last 'OGS1' logging message (in this case, an erroneous one)
2010-08-19 01:57:07 +01:00
a72c7812f4
remove ancient and unused OpenSim.GridLaunch GUI code.
...
Current policy is that OpenSim core is not the place for gui tools
2010-08-19 01:11:10 +01:00
5e3d53bef2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-19 00:54:48 +01:00
85f448642b
minor: Correct string format in "Can't find linkset root prim" message
2010-08-19 00:54:09 +01:00
e47608fc62
One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943 .
...
(Files .xml and .txt also want to be committed)
2010-08-18 16:22:50 -07:00
6ddf124c8a
Prevent a bad cast in llCreateLink().
2010-08-18 20:00:19 +01:00
fb2deb0d45
Prevent a bad cast in llCreateLink().
2010-08-18 20:17:20 +02:00
810840b862
Fix a typecasting issue in llList2Float. This addresses mantis #262
2010-08-18 04:23:56 -07:00
ca8b1e488c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-18 02:53:27 -07:00
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
a8c0b131f9
* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() to fix the build
2010-08-17 13:50:04 -07:00
d7824b86d9
Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. Basically, let's not let the xml-rpc library do the DNS conversion...
2010-08-16 14:36:20 -07:00
69ad04cdf6
Attempt at sending TeleportProgress, but it doesn't seem to be doing anything at all. Left it commented, just as a reminder for where those messages could be sent.
2010-08-16 12:03:13 -07:00
a8b80ef800
Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected.
2010-08-16 11:39:46 -07:00
77de28965a
Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule).
2010-08-16 11:33:59 -07:00
f219e320bc
Increased the timeout on AgentUpdate to 30 sec and improved error message to try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too).
2010-08-16 08:51:56 -07:00
a5044e08fb
Better comment (related to previous commit)
2010-08-15 18:13:09 -07:00
5d29c0ec9d
Addresses mantis #4929 . Agent was being logged off the grid too soon -- things may still fail.
2010-08-15 18:10:54 -07:00
30d0bf4207
Fix SQLite database plugin for UserAccountData queries with a single word.
2010-08-15 17:27:06 -07:00
d5c24241b7
Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG)
2010-08-15 17:25:27 -07:00
f2d7f3e731
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-14 14:00:12 +02:00
a32b0ce0ae
Fix a possible nullref in BestAvatarResponsiveness policy
2010-08-14 13:59:36 +02:00
042eb80a62
clearing some debugmessages
2010-08-14 08:59:57 +00:00
96e4099564
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-13 17:40:18 -07:00
d806741e9d
* Cleaned up the magic UUID definitions in AvatarWearable.cs
2010-08-13 17:39:45 -07:00
e1cff5f8c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-14 00:58:12 +01:00
46d0690b31
* Fixed a casing typo for Simian profile data
...
* Minor logging tweak in Simian asset connector
2010-08-13 16:56:01 -07:00
1463691cb6
In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from libomv rather than little endian then swapping
...
This avoids a problem with failing to swap on big-endian machines.
This addresses http://opensimulator.org/mantis/view.php?id=4849
Thanks to Valy- for pointing this out and submitting a suggestion patch
2010-08-14 00:48:12 +01:00
fcc83f2305
Unit test for ConfigurationLoader.
...
Adds a new test assembly for OpenSim.
2010-08-13 23:59:33 +01:00
ae43a07f3b
Configuration files can read include files from relative paths.
2010-08-13 23:59:30 +01:00
8eeb3f2fd2
Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console.
2010-08-13 23:29:01 +01:00
8acb401a14
minor: remove mono compiler warnings
2010-08-13 23:28:28 +01:00
c64bef146b
minor: remove mono compiler warnings
2010-08-13 23:18:05 +01:00
ab6dc47818
refactor: move binary statistics logging from scene into separate region module
2010-08-13 23:15:11 +01:00
e89f0b3f71
refactor: move Scene.PerformObjectBuy into BuySellModule
2010-08-13 22:29:42 +01:00
9d84dfb687
minor: remove mono compiler warning
2010-08-13 21:44:44 +01:00
b30635a454
Establish new Objects/BuySellModule
...
Move Scene.ObjectSaleInfo() to this
2010-08-13 21:39:43 +01:00
feba3164af
minor: remove mono compiler warning
2010-08-13 21:19:32 +01:00
5d20f04e08
refactor: move Scene.TerrainUnAcked() handling into TerrainModule
2010-08-13 21:18:26 +01:00
b51534852f
minor: remove mono compiler warning
2010-08-13 21:07:45 +01:00
fd23f270c6
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
2010-08-13 21:01:10 +01:00
5f5c65e4ba
refactor: move more map tile generation code from scene to IWorldMapModule
2010-08-13 20:34:46 +01:00
39a748b47a
refactor: Use SOP.Flags rather than SOP.ObjectFlags
2010-08-13 20:23:53 +01:00
b43a731beb
Fix a nullref exception in the prioritizer
2010-08-12 05:40:41 -07:00
c98c6a2930
File wants to be committed
2010-08-11 20:38:10 -07:00
251be8a1be
Prettify console output for long avatar names.
2010-08-11 20:22:01 -07:00
576faee203
minor: change some logging levels
2010-08-11 23:17:29 +01:00
686f44c575
minor: change "no [GridInfo] config" warning to refer to "configuration files" rather than "OpenSim.ini"
2010-08-11 23:16:33 +01:00
7aac4d650f
Fix the llRemoveInventory recursive lock error (again)
2010-08-11 14:30:09 -07:00
24577876be
Add some console debug to help fix a threadlock issue.
2010-08-11 14:10:47 -07:00
ac581b532e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-11 13:40:31 -07:00
fa393cb13a
Fix Omega getting overwritten on startup.
2010-08-11 13:39:36 -07:00
d00a954d35
Log the state of the prejump flag
2010-08-11 03:09:56 +02:00
a5a60df687
Change chat packets to bypass the throttles. This should alleviate chat lag
2010-08-11 02:52:52 +02:00
af60b8ac16
Set triggering the texture and height update on a two second timer. This fixes
...
the texture rubberbanding.
2010-08-10 22:52:51 +02:00
4f62f00ca0
Changing prim color generates event CHANGED_COLOR.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:38:39 +01:00
3f942a4f74
Removed abstract SetText method from EntityBase to make cleaner API.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:37:15 +01:00
75f92faeb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-10 19:34:57 +01:00
158604a733
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-10 20:17:47 +01:00
2a1c11fda9
On shift-copy of an object, set up a new physics actor (as appropriate) for every copied prim, not just the root
...
This addresses http://opensimulator.org/mantis/view.php?id=4295
2010-08-10 20:15:44 +01:00
6147efdad9
Avoid truncation of error message during region creation.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:34:09 +01:00
a299fa4849
This file wants to be committed
2010-08-10 11:18:39 -07:00
7741143fb5
Enforce DB limits on region name to 32 chars, or else (not good). Removed a piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name.
2010-08-10 11:17:38 -07:00
1582e05ac7
Fix a nullref issue in the AgentSetAppearance packet handler when removing the physactor from the scene
2010-08-10 09:55:40 -07:00
48c52d6e48
Fix a dangling lock issue in llRemoveInventory
2010-08-10 09:50:18 -07:00
0a81038dd5
Reduce number of paths in SOP code by setting flags via Flags property rather than _flags
...
Both ObjectFlags and Flags are effectively exactly the same property, except that ObjectFlags is uint and Flags is PrimFlags
Both reference the PrimFlags _flags underneath, so you couldn't set a non PrimFlags uint anyway.
Deprecated ObjectFlags in favour of Flags.
2010-08-10 17:26:31 +01:00
fb14390fb0
Note to self: don't break the build
2010-08-10 09:17:30 -07:00
9fba4b66bb
Resolve merge failure
2010-08-10 09:11:55 -07:00
5e8c3f8325
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-10 20:12:13 +01:00
7fead01786
remoning debug messages
2010-08-10 19:43:32 +00:00
d0a22fb359
fixed ground texture issues ( it seems )
2010-08-10 19:35:17 +00:00
24b9a2885f
Resolve merge issues
2010-08-10 20:11:55 +01:00
c2e5d1d203
Merge branch 'master' into careminster-presence-refactor
2010-08-10 19:49:35 +01:00
383ee0d647
Remove 4000+ DOS line endings. Grrr!
2010-08-10 19:48:45 +01:00
d98d5ee6be
Remove windows line endinge
2010-08-10 19:42:18 +01:00
1ead2ed5ee
Add a stack trace to the error output on the recursive read lock warning on my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into.
2010-08-10 09:07:17 -07:00
7203feb83c
Extend DuplicateObject() test to check flags on the duplicated object
2010-08-10 16:50:36 +01:00
85fc2dfe3c
extend TestDuplicateObject() to a two prim object
2010-08-10 16:16:57 +01:00
a5dab074a0
Handle incoming ObjectImage (TextureEntry) updates synchronously rather than asynchronously
...
At least on stock Linden clients, updating the texture on all faces of the prim will actually send an ObjectImage packet for each update.
There is a race condition if these are handled async, meaning that occasionally not all of the faces are correctly updated.
2010-08-10 16:00:35 +01:00
912bfba20c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-09 23:36:59 -07:00
eb5c508f8b
Add a DebuggerSafe option to the ini to help with debugging in visual studio. This essentially silences exceptions in the script engine. Disabled by default, naturally.
2010-08-09 23:35:40 -07:00
f0bad66d41
For my own sanity, fix a bug in xengine
2010-08-09 23:34:37 -07:00
0f9eebdfb1
Change prejump from hardcoded true to default true so it can be disabled.
...
It completely destroys roleplay jumping
2010-08-10 03:52:00 +02:00
3b26baf282
Even if all data migratios are up to date, still print the current revision to the log
2010-08-09 22:54:13 +01:00
bef6fa37b9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-08 18:57:16 -07:00
32ccc19a62
Make fallbacks work, the destination was never actually updated with the fallback details.
2010-08-08 18:56:47 -07:00
144fc20e87
Make fallbacks work, the destination was never actually updated with the fallback details.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-09 02:23:59 +01:00
f20dc512e8
Whitespace conflict
2010-08-09 02:46:09 +02:00
1f052520ae
Merge branch 'master' into careminster-presence-refactor
2010-08-09 02:27:54 +01:00
680e801bf2
Print a console message when we deny access because of no valid parcel found.
2010-08-08 17:32:20 -07:00
603b3a1606
Fix minimap issues. This addresses mantis #228 .
2010-08-08 17:31:29 -07:00
b0795bcfef
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-09 00:49:40 +01:00
52f49b2a78
Merge branch 'master' into careminster-presence-refactor
2010-08-09 00:49:15 +01:00
bc7ee7ba88
Remove "Could not authorize your session into the region" message in favor
...
of sending back the actual error message provided by the sim.
2010-08-09 00:48:08 +01:00
ca2a4bbded
Add debug messages to attachment receiving and cowardly refuse to create
...
them if the owner can't be determined.
2010-08-08 19:35:20 +02:00
321e1148da
Merge branch 'master' into careminster-presence-refactor
2010-08-08 18:24:33 +01:00
a5e4a2bb3b
Add distance sort for null, too
2010-08-08 18:18:42 +01:00
f216fd8136
Tests for distance-sorted fallback regions.
...
With some extensions to existing grid service tests.
2010-08-08 18:12:07 +01:00
1f25b9e8db
Thank you, Marck00, for a patch that implemented region distance sorting
...
for fallback regions. Applied with changes.
2010-08-08 17:37:50 +01:00
6cb50c49b5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-08 17:53:25 +02:00
1cde77293e
Thank you, Marck00, for a patch that implemented region distance sorting
...
for fallback regions. Applied with changes.
2010-08-08 17:51:43 +02:00
a1f2be5e69
The real fix for unscripted sit positions. This one doesn't fuck everything else up. Promise.
2010-08-07 22:25:37 -07:00
f9b5f23383
Reverted: * Fix the unscripted sit rotation being incorrect .. will commit a proper fix now.
2010-08-07 22:19:26 -07:00
12dd97c9f8
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 20:14:58 -07:00
0794c6a941
Implement parcel group access control. This addresses mantis #158 .
2010-08-07 20:13:45 -07:00
cd2c7b9ac9
In my crusade against facelights, I am striking the killing blow. Add a
...
DisableFacelights option to OpenSim.ini to finally kill those immersion-
breaking, silly vanity lights that destroy nighttime RP. Girls, you look
just fine without them. Guys, you too. Thank you. Melanie has left the building.
2010-08-08 01:57:02 +01:00
aa54e8d95e
Increase sit distance to 256 meters, but leave the initial autopilot process in the picture so sit position can still be raycast by the existing code.
2010-08-07 17:35:16 -07:00
b771965f28
Get rid of some debug chatter that someone who can't spell left behind. ;)
2010-08-07 17:33:27 -07:00
acb1590cf0
Fix the unscripted sit rotation being incorrect (relative to the prim). Note that unscripted sit offset is still really poor but this is not something i'm prepared to spend time on fixing.
2010-08-07 17:32:36 -07:00
d2b3d45d76
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-08 02:04:37 +02:00
50ac61e17f
In my crusade against facelights, I am striking the killing blow. Add a
...
DisableFacelights option to OpenSim.ini to finally kill those immersion-
breaking, silly vanity lights that destroy nighttime RP. Girls, you look
just fine without them. Guys, you too. Thank you. Melanie has left the building.
2010-08-08 02:01:24 +02:00
19ab4c9508
Fix a rather nasty issue where the Backup() process causes objects and avatars sitting on them to be pushed to the corner of the sim.
2010-08-07 16:52:03 -07:00
8d3a73d126
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 16:32:18 -07:00
a6048518b7
Repair lsGetWindlightScene, the constant was added to the list as a uint, which is bad - convert to LSL_Integer first.
2010-08-07 16:18:44 -07:00
ab5a461c5c
Add search URL to Login Service
2010-08-07 22:25:29 +01:00
903cfa8c7e
minor: Remove overly verbose schedule full update log message for attachments
2010-08-07 22:28:42 +01:00
4c5788c4c0
Add search URL to Login Service
2010-08-07 22:24:17 +01:00
68e4b1115a
Dumb error in fix
2010-08-07 22:23:51 +01:00
71f2cec1bd
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 22:11:18 +02:00
4900d39b7d
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 21:05:18 +00:00
478d835392
removing more stains ...
2010-08-07 21:04:16 +00:00
7bac069976
Mantis #229 . Fix Global sim ccordinates
2010-08-07 22:10:46 +02:00
cabbd187e7
Fix the distance from which autopilot is negated when sitting on an unscripted prim - and also add some more Velocity code to ensure it gets set to zero in all cases
2010-08-07 11:13:05 -07:00
413b0525db
It seems hippo disregards velocities in full updates, so also send a terse update when an agent sits to avoid drifting off
2010-08-07 11:06:07 -07:00
19debab060
Fix the general alert message so it doesn't get sent to child agents
2010-08-07 08:17:11 -07:00
b017d985ab
Add some nullref checks to the UnackedPacketCollection.
2010-08-07 08:06:41 -07:00
b58a47c373
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 13:41:56 +00:00
00cc42a607
and another endless debug cleaning
2010-08-07 13:40:38 +00:00
bcb3b57f8d
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 06:33:51 -07:00
4f80d75bf3
Add a CHANGED_POSITION event so scripts don't have to run expensive loops to check for position changes
2010-08-07 06:28:04 -07:00
047a4764f2
and another one...
2010-08-07 13:19:53 +00:00
e69efdd4ce
Clean the loo after use please !!!!!
...
No need to keep useless debug message !
Never heard of wasted cpucycle you darn kid !
2010-08-07 13:13:27 +00:00
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
a04efe4a4d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-07 05:39:20 +01:00
00fd2e0446
Correct display of landmark about info. Also correct region maturity rating
...
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:33:49 +01:00
59af886680
Change the (hackish) constant to match the changed enum for attachs
2010-08-07 05:33:41 +01:00
2cedfba67c
Make the landmark properties work again
2010-08-07 05:33:21 +01:00
c554de7501
Correct display of landmark about info. Also correct region maturity rating
...
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:45:52 +02:00
fa11ac8c85
Change the (hackish) constant to match the changed enum for attachs
2010-08-07 05:42:30 +02:00
7477d7a036
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 03:40:01 +02:00
a783f048a3
Make the landmark properties and search places work again
2010-08-07 03:38:35 +02:00
5e93a83ecd
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-06 17:43:41 -07:00
0090534793
Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker.
...
ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
2010-08-06 17:43:09 -07:00
4e2caab756
Add new SceneGraphTests class. Add simple TestDuplicateObject()
2010-08-07 01:06:47 +01:00
7e47ab746e
Allow creation of link regions if there is an existing region within a 4096 range.
...
Also add GetHyperlinks() to the grid service.
2010-08-06 17:02:03 -07:00
8d520f4525
Remove old test classes that don't actually test anything not done elsewhere
...
Also comment out log4net line in InventoryArchiverTests
2010-08-07 00:50:01 +01:00
6c8c8d669b
minor: a few miscellaneous comments
2010-08-07 00:45:04 +01:00
85d7d0583e
Fix XStats formatting:
...
Recent libomv update broke the json serialization for
XStats. This uses String.Format to convert all data to
strings with fixed decimal (2 places ), or integer formats
as appropriate.
2010-08-06 23:27:57 +01:00
f9f776e407
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 11:44:57 -07:00
330343505c
Implement CreateNewOutfitAttachments. This addresses mantis #199 .
2010-08-06 11:39:10 -07:00
2369063640
HACK ALERT! There's some underlying bug in the HTTP server that makes requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
2010-08-06 10:59:19 -07:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
cc05fc43b9
Fix a parenthesis in prior commit
2010-08-06 17:55:41 +01:00
e941da205b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 09:54:09 -07:00
03da22378e
Estate managers should be allowed to add and remove new users, groups and bans to/from the estate settings.
2010-08-06 09:53:40 -07:00
1cd441d5de
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-06 17:47:55 +01:00
1270727c96
Merge branch 'moap'
2010-08-06 18:29:30 +01:00
54dcfe3f2d
Fixes: llSetLinkPrimitiveParams - PRIM_POSITION is not relative to root, causes unexpected movement of child prims
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-06 17:38:29 +01:00
0d4086e602
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 08:09:10 -07:00
52e2360e91
Since i've narrowed the fault down to one function, add some spammy debug to try and fix ghost prims on HUDs in future. Note, the console only gets messages if there is a problem, so it's harmless.
2010-08-06 08:08:43 -07:00
e1e897ac11
Change XEngine to use the new constant
2010-08-06 15:18:46 +01:00
120f3a18f2
Correct some script constants.
2010-08-06 15:11:18 +01:00
5559422d32
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 16:09:45 +02:00
c48be64d9a
Remove posting region restart event from SOP, as it's now in XMRe
2010-08-06 16:08:50 +02:00
c1ad8a3c17
People can't leave their hands ooff "well enough". StateSource 0 was region
...
start, and they started at 1 for real values. Whoever changed that enum
to start at 0 should bow their head in shame. They broke the region start
event. This puts it right again. Meow!
2010-08-06 15:05:35 +01:00
f809797d62
Allow the trash folder itself to be passed to PurgeFolder
2010-08-06 15:04:25 +01:00
3ce335c6f8
Fix StateSource constants, provide RegionStart
2010-08-06 06:41:25 -07:00
a636af13e7
Make sure the avatar position gets moved along with a prim it is sitting on. This fixes mantis #208 and (maybe) issues with chat and sound coming from the wrong place when sat on a vehicle.
2010-08-06 06:37:40 -07:00
696c2c429b
Change XEngine to use the new constant
2010-08-06 15:33:22 +02:00
42613ec536
Allow the trash folder itself to be passed to PurgeFolder
2010-08-06 15:18:48 +02:00
5da272d042
reverese my last commit
2010-08-06 14:45:54 +00:00
23d1f0978e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 14:39:34 +00:00
a390541e1c
Allowing the expected purge trash folder...
...
Please validate !!!
2010-08-06 14:38:11 +00:00
0a004f8c44
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 02:43:26 -07:00
c5c6627adb
Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53 .
2010-08-06 02:40:31 -07:00
db2f63706d
Prevent users from becoming stuck online. This affects only 0.7
2010-08-05 23:49:07 +01:00
d7fe9f7b44
Prevent users from becoming stuck online. This affects only 0.7
2010-08-06 00:02:38 +02:00
7368992ee9
Actually cache positives
2010-08-05 23:48:55 +02:00
1cae505ea1
Prevent hammering the grid services with llRequestAgentData requests. Cache the
...
user information permanently, and the online status for 20 seconds. Also
cache negatives.
2010-08-05 22:36:43 +01:00
d8f9b98c4a
Prevent hammering the grid services with llRequestAgentData requests. Cache the
...
user information permanently, and the online status for 20 seconds. Also
cache negatives.
2010-08-05 22:50:09 +02:00
8bdbcda2b7
We already have a record of killed prims. It just wasn't used by the new
...
JHurlicane code anymore. Use it to prevent sending updates after kills.
2010-08-05 18:50:17 +02:00
05520d676c
Revert "Enforce a 0.2 second sleep on llDie() before the command is executed - this should get rid of ghost prims (which are much rarer, but still occuring)"
...
This reverts commit 85fd2def9c
2010-08-05 18:45:17 +02:00
847008ee07
Addresses http://opensimulator.org/mantis/view.php?id=4919
2010-08-05 09:43:19 -07:00
0eda6714f3
llRequestSimulatorData DATA_SIM_POS : Divide by RegionSize, don't multiply. This resolves mantis #215
2010-08-05 08:41:08 -07:00
85fd2def9c
Enforce a 0.2 second sleep on llDie() before the command is executed - this should get rid of ghost prims (which are much rarer, but still occuring)
2010-08-05 08:15:05 -07:00
9e9296848d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-05 08:20:32 +01:00
1869572297
Prevent setting the hovertext from firing changed_color
2010-08-05 08:19:46 +01:00
8689cdd4dc
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 19:47:47 -07:00
663e25fd3a
Pacify osGetAvatarList to provide LSL types instead of omv types
2010-08-04 19:46:41 -07:00
0871d20adb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 21:08:14 +00:00
cb3b124df9
Fixes fresh hollowed prim collision shape.
2010-08-04 21:08:00 +00:00
a133acbd5f
Merge branch 'iar-merge'
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
2010-08-04 20:56:52 +01:00
7f3f1bfe88
fix mysql/mssql prim serialization problem
2010-08-04 20:23:18 +01:00
a1d7911feb
Better debug messages
2010-08-04 11:19:23 -07:00
4a33210771
Send attachment updates only to the owner if it's a HUD
2010-08-04 18:12:31 +02:00
f72ab53699
Removed a few more obsolete default configs.
2010-08-04 07:50:34 -07:00
a48c493210
Cost Reduction : Removing verbose message....
2010-08-04 08:16:55 +00:00
463fbb4990
If a user has no home position set, tell them so instead of leaving the request dangling
2010-08-04 00:17:02 -07:00
c8f09f7fcb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 22:42:32 -07:00
cd9506e842
Don't know HOW we missed this, llSetPos was broken in child prims (and in the llSetPrimitveParams family), it was using the global coordinate as a start location. This resolves mantis #204
2010-08-03 22:41:02 -07:00
6076eb5558
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 19:55:57 -07:00
604ea5fa90
remove more useless defaults
2010-08-04 03:53:51 +01:00
f1c51c8bb4
Scripted sit target fixes
2010-08-03 19:51:32 -07:00
09ab32c21e
Remove StandAlone from default hardcoded config
2010-08-04 03:10:10 +01:00
bda83715e4
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:46:30 +01:00
b38d69287a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 03:24:06 +02:00
0020dbee23
Remove StandAlone from default hardcoded config
2010-08-04 03:23:19 +02:00
9ee712459b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-03 18:20:08 -07:00
53fb799778
Further bug fixing, still related to the issue earlier.
2010-08-03 18:19:40 -07:00
5ff9db7388
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:51:41 +02:00
3c5983d8bd
Another bug fixed. Same issue.
2010-08-03 17:29:17 -07:00
d57bfec702
A god is a god is a god is a god. Right? Right. You're a god from 200, let's
...
show it!
2010-08-04 02:16:46 +02:00
757929012e
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:11:47 +01:00
71cd4d6e84
Revert "remove long unused OpenSim/Framework/Configuration/* projects"
...
This reverts commit cdd3f17b2b
2010-08-04 01:10:01 +01:00
dd0ebbfb1f
this is so bad, brain is beyond fried. must stop.
2010-08-03 17:05:48 -07:00
dd688a5994
sigh. fried brain.
2010-08-03 16:59:34 -07:00
87046652b1
One more buglet related to the issue at hand.
2010-08-03 16:33:56 -07:00
e12993ed22
Merge branch 'master' into careminster-presence-refactor
2010-08-04 00:33:02 +01:00
16bdb53683
Allow specifying default region flags. Correct a typo.
2010-08-04 00:31:25 +01:00
ee068dd243
One more thing related to the previous commit. Must avoid all in-process remote calls.
2010-08-03 16:27:11 -07:00
239478f3a9
Bug fix (HG): mantis #4891 . This doesn't actually fix the underlying bug, but it clears up the circular dependency issue between Gatekeeper and UserAgents that had made me resort to in-process remote calls, which, in turn, were hitting bugs down there somewhere in mono.
...
NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!!
2010-08-03 16:02:52 -07:00
d9ae837063
Allow specifying default region flags. Correct a typo.
2010-08-04 00:45:15 +02:00
e3cea888fb
Fix some more issues causing regions with corrupt sculpts to freeze.
2010-08-03 16:07:18 -07:00
ae99c1393d
Fix scripted sit offset in child prims
2010-08-03 15:31:04 -07:00
2221517935
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 14:12:05 -07:00
1d1da5069c
Catch a meshing exception caused by corrupt or missing sculpt maps, and mark the prim as "mesh failed" so it doesn't try meshing continuously
2010-08-03 14:11:11 -07:00
6e3c79f31e
don't mask current time reads (since we don't mask the corresponding subtract)
...
if you mask the reads you have to mask the subtract as well.
simplest is just don't mask any of it.
2010-08-03 20:09:00 +00:00
f04d51378f
Drop the RestClient timeout from 15 minutes to 30 seconds. This does not address the problem, but it will allow the regions to recover in the event that the remote server goes away.
2010-08-03 11:06:41 -07:00
2a0254f2da
Implement MediaUrl persistence for MySQL and MsSQL
...
Not sure how I forgot this. This may resolve problems with media textures not persisting over restart for these databases.
2010-08-03 17:54:40 +01:00
99c0f4c9c7
Simplify serialized version string. Change element capitalization for consistency
...
THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database.
This commit also improves locking for manipulation of media entries.
2010-08-03 17:09:20 +01:00
9d8a67fe13
get rid of PrimitiveBaseShape.MediaRaw staging post
...
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
2010-08-03 16:26:27 +01:00
ac07d853b8
remove duplicated serialization code
2010-08-03 15:58:17 +01:00
60df76314f
serialize media textures to inventory with a largely osd representation rather than .net auto-serialization
...
THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.
2010-08-03 15:45:49 +01:00
e3184753a6
Log the UUID of a prim that fails meshing and set the prim to phantom during
...
region startup
2010-08-03 05:25:23 +02:00
d2d1c63b17
Revert "Catch meshing error in Meshmerizer"
...
This reverts commit 8f2986bc6a
2010-08-03 05:25:01 +02:00
ecfea5fa69
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-02 21:56:30 -07:00
8f2986bc6a
Catch meshing error in Meshmerizer
2010-08-02 21:54:47 -07:00
8e37e7eb07
Remove the (wrong) implementation if llPointAt. It never worked on the LL
...
grid and is officially deprecated. There is no way to rotate an avatar
programmatically.
2010-08-02 00:41:40 +01:00
16e90809a9
Remove the (wrong) implementation if llPointAt. It never worked on the LL
...
grid and is officially deprecated. There is no way to rotate an avatar
programmatically.
2010-08-02 00:54:58 +02:00
d2d56494b2
Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default)
2010-08-01 10:24:43 -07:00
763dc8bb76
Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the xmlrpc_uri event if it's not mentioned in the ini.
2010-08-01 10:24:17 -07:00
b860c8021e
First, change DefaultPermissionsModule so it returns the correct name...
...
... Then, make sure we also check the old-style module stack before we throw a tantrum
2010-08-01 10:23:48 -07:00
d5f497478a
Add config option securePermissionsLoading which will stop the region from loading if the specified permissions modules fail to load.
2010-08-01 10:21:56 -07:00
5f94b98cb2
Merge branch 'master' into careminster-presence-refactor
2010-08-01 18:00:04 +01:00
5e759338ca
Renamed variables in RemoteAdmin plugin to be closer to the coding standards.
2010-08-01 17:20:09 +01:00
93532a9cd2
Changed all method names in the RemoteAdmin plugin to use the correct capitalization.
2010-08-01 17:20:09 +01:00
c4ecbd1fb1
White space from previous commit.
2010-07-31 16:40:58 -07:00
f91ec19224
Implemented console command "show hyperlinks".
2010-07-31 16:38:23 -07:00
ed59dcd422
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-07-30 18:07:50 -07:00
8c7fd12d5d
Bug fix: make m_HypergridLinker static.
2010-07-30 18:07:14 -07:00
dd2d9a68a7
Merge branch 'master' into careminster-presence-refactor
2010-07-31 01:05:13 +01:00
168a8e9ae5
Thank you, Snoopy, for a patch to fix child prim movement. This still doesn't
...
address limiting link distance, but at least it makes the UI and LSL
match.
2010-07-31 01:03:14 +01:00
3302e8ddc4
Merge branch 'master' into careminster-presence-refactor
2010-07-31 00:57:50 +01:00
86bc25b84f
Slight improvement on previous commit.
2010-07-30 14:27:53 -07:00
f3fa10fa15
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-07-30 14:04:29 -07:00
8ab7d80b09
Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
2010-07-30 14:04:13 -07:00
f84dbafb0c
remove gods event subscription to gods module from scene
2010-07-30 21:58:24 +01:00
63f3a16b72
remove empty, unused and uncalled UnsubscribeToClientEvents()
2010-07-30 21:44:50 +01:00
424b4b2b86
move attachment subscription events into AttachmentsModule from scene.
...
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
2010-07-30 21:41:44 +01:00
4d83b2d8a6
remove unused BasicQuadTreeNode
2010-07-30 21:06:45 +01:00
f37ec933ae
store terrain module trying to load plugins if plugin path does not exist
2010-07-30 20:54:02 +01:00
c6bc1d28ec
move ChannelDigger from its own project into the main terrain module with the rest of the effects
2010-07-30 20:34:14 +01:00
cdd3f17b2b
remove long unused OpenSim/Framework/Configuration/* projects
2010-07-30 20:19:46 +01:00
68b1d6f0af
Remove unused ILoginServiceToRegionsConnector
2010-07-30 20:02:00 +01:00
315b065bce
Remove unused LLFileTransfer
2010-07-30 19:58:29 +01:00
ce358db159
remove long superseded HGNetworkServersInfo
2010-07-30 19:54:27 +01:00
4596c78073
remove unused FriendRegionInfo
2010-07-30 19:50:47 +01:00
c7652d287b
remove now unused GridConfig, MessageServerConfig, UserConfig
2010-07-30 19:44:39 +01:00
f393e10ea4
remove unused ACL class
2010-07-30 19:34:55 +01:00
5b80e3fc18
convert attachments module from old region module style to new
2010-07-30 19:26:54 +01:00
f9280374d2
Bannination fixes. Objects in nonpublic parcels were muted by default. Gods
...
were muted, too.
2010-07-30 15:03:03 +02:00
b83910f12a
* Added debug logging to SimianGrid inventory service response parsing
2010-07-29 16:42:00 -07:00
e0de8fa308
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-29 23:20:50 +01:00
2257e39eda
Make dataserver() return a 0 when agent id offline, instead of a timeout
2010-07-29 23:20:38 +01:00
550c3572a1
* Tweaked WebUtil.PostToService() to help debug an object disposed exception
2010-07-29 14:39:08 -07:00
7a9e246ccd
Merge branch 'master' into careminster-presence-refactor
2010-07-29 16:20:59 +01:00
696b6c727f
Allow gods and estate managers/owners to be unaffected by parcel bans
2010-07-29 16:20:40 +01:00
7871dd606e
Allow gods and estate managers/owners to be unaffected by parcel bans
2010-07-29 16:33:20 +02:00
f067f733ea
add userExposed parameter to part copy event
2010-07-28 19:38:20 +01:00
0f15ccb2cf
relocate moap specific cloning code to MoapModule
2010-07-28 19:23:30 +01:00
5aa56b1274
Fix problem where changes to media textures for prims duplicated by shify copy would change both prims until server restart
...
I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
2010-07-28 18:55:29 +01:00
a349703279
comment out further debug line in BaseHttpServer
2010-07-27 22:51:57 +01:00
b149d8970e
comment out verbose debug logging
2010-07-27 22:49:45 +01:00
30ac67fb3d
make MoapModule ignore possible future media texture data that it can't handle
2010-07-27 20:15:43 +01:00
ac542a907b
Make MoapModule ignore non-sl media texture data
2010-07-27 18:59:05 +01:00
109ddd1bd5
add mssql support for media on a prim
...
compiles but not tested. please test and correct if necessary!
2010-07-26 23:34:23 +01:00
849fc0483f
add mysql support for media on a prim
2010-07-26 23:34:23 +01:00
4d23749241
provide config option for media on a prim
2010-07-26 23:34:23 +01:00
412fed975f
relocate serialization code from SQLiteRegionData to MoapModule using load and save events.
...
This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
2010-07-26 23:34:23 +01:00
b51b2efdc8
Add EventManager.OnSceneObjectPreSave() for future use. This is triggered immediately before a copy of the group is persisted to storage
2010-07-26 23:34:22 +01:00
586ae0f6a0
Add EventManager.OnSceneObjectLoaded() for future use. This is fired immediately after a scene object is loaded from storage.
2010-07-26 23:34:22 +01:00
afdbeba4e4
Put a wrapper around the media texture region serialization
...
THIS WILL BREAK EXISTING MEDIA TEXTURE PERSISTENCE. Please delete your existing sqlite databases if you are experimenting with this branch.
This wrapper will make it easier to maintain compatibility if the media texture data evolves.
This will also make it easier to store non-sl media texture data.
2010-07-26 23:34:22 +01:00
d764c95d09
also add avatar id to an updated media url - not just new ones
2010-07-26 23:34:22 +01:00
b06308e1d3
Properly set TextureEntry.MediaFlags when a media texture is set
...
Media flags is cleared via a direct TextureEntry update from the client. If the clearing leaves no media textures on the prim, then a CAP ObjectMediaUpdate is not received. If there are still media textures present then one is received.
This change fixes drag-and-drop on Windows (and Mac?) clients. It may also fix problems with clearing and then subsequently setting new media textures.
2010-07-26 23:34:22 +01:00
60c52ac0c4
start adding user ids to the media urls
2010-07-26 23:34:22 +01:00
f872a2af11
add missing regionstore migration file for new fields. D'oh!
...
this should enable persistence now
2010-07-26 23:34:22 +01:00
cd985ab71b
Handle checking of line starting "*" wildcard for whitelist patterns
...
A line starting * can only be applied to the domain, not the path
2010-07-26 23:34:21 +01:00
664cbe2357
refactor: simplify current whitelist url checking by using System.Uri
2010-07-26 23:34:21 +01:00
0edabffb7d
Implement * end wildcard for whitelist urls
2010-07-26 23:34:21 +01:00
dce7307aa2
properly expose prim media LSL functions to scripts
...
scripts using these functions should now compile but I don't know how well the methods themselves work yet
llSetPrimMedia(), at least, appears to have problems when a current url is set for a face that doesn't yet have a texture
2010-07-26 23:34:21 +01:00
fc76ce0f46
fix bug where prim persistence would fail if media had never been set
2010-07-26 23:34:21 +01:00
049ccba8d3
fix previous media interact serverside checking. perform very basic serverside url whitelist checks
...
at the moment, only checking for the exact name prefix is implemented
for some reason, whitelists are not persisting
this commit also fixes a very recent problem where setting any media texture parameters after the initial configuration would not work
2010-07-26 23:34:21 +01:00
cf7573c8fd
implement code to deregister users on DeregisterCaps
2010-07-26 23:34:21 +01:00
ee6cd884c9
implement serverside checks for media texture navigation in order to stop naughty clients
2010-07-26 23:34:21 +01:00
a9101feb10
factor out soon to be common media permissions check code
2010-07-26 23:34:20 +01:00
51b208e96c
implement prim media control permissions serverside in order to stop bad clients
2010-07-26 23:34:20 +01:00
e5615d3a9b
discard an object media update message if it tries to set more media textures than the prim has faces
2010-07-26 23:34:20 +01:00
eb5e39d6ef
Fire CHANGED_MEDIA event if a media texture is set or cleared
2010-07-26 23:34:20 +01:00
39a38c4901
implement llClearPrimMedia()
...
untested
2010-07-26 23:34:20 +01:00
d1a879927c
fix issue with GetMediaEntry if the face requested wasn't set to a media texture
2010-07-26 23:34:20 +01:00
43f480864b
fix problem persisting when only one face had a media texture
2010-07-26 23:34:20 +01:00
c76e2ce250
factor out common code for updating the media url
2010-07-26 23:34:19 +01:00
74bc4f61fd
factor out common face parameter checking code
2010-07-26 23:34:19 +01:00
cfb79cd411
minor: correct a few method names and change accessability
2010-07-26 23:34:19 +01:00
a5ad792e6c
implement llSetPrimMediaParams()
...
Untested
2010-07-26 23:34:19 +01:00
8f403cb4b8
Implement llGetPrimMediaParams()
...
Exposes method to get media entry via IMoapModule
As yet untested.
2010-07-26 23:34:19 +01:00
9682e0c733
Implement media texture persistence over server restarts for sqlite
...
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26 23:34:19 +01:00
4ebae14a53
handle ObjectMediaNavigateMessage
...
Other avatars can now see the webpages that you're navigating to.
The requirement for an initial prim click before the texture displayed has gone away.
Flash (e.g. YouTube) appears to work fine.
Still not persisting any media data so this all disappears on server restart
2010-07-26 23:34:18 +01:00
468450a94d
send a full object update out to avatars when a media texture is initially set
...
this allows other avatars to see it, but still only after they've clicked on the face
still not handling navigation yet
2010-07-26 23:34:18 +01:00
b1eb83ed6c
start sending media url in object full updates
2010-07-26 23:34:18 +01:00
4a6adff4cd
start storing a mediaurl on the scene object part
...
not yet persisted or sent in the update
2010-07-26 23:34:18 +01:00
c290cdd997
replace hand parsing of incoming object media messages with parsing code in libopenmetaverse
2010-07-26 23:34:18 +01:00
acac47830e
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
...
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
2010-07-26 23:34:18 +01:00
9301e36fbc
have a stab at sending the correct number of media entries to shapes
...
actually, this is probably wrong anyway if there's a default texture
it's going to be easier just to gather the object media updates and retain those in-memory now
but what the hell
2010-07-26 23:34:17 +01:00
701f39c8c2
do a whole load of crappy hacking to get cubes to display google.com
...
currently, for smoe reason the page only appears when you click a face.
also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason
you can still change the url and normal navigation will work again
2010-07-26 23:34:17 +01:00
2be7d0cdd4
Register ObjectMedia and ObjectMediaNavigate capabilities from moap module.
...
Not sure if these are correct, but just supplying these to the viewer is enough to allow it to put media textures on prims (previously the icons were greyed out).
This is not yet persisted even in-memory, so no other avatars will see it yet.
2010-07-26 23:34:17 +01:00
ede446cad6
add stub media-on-a-prim (shared media) module
2010-07-26 23:34:17 +01:00
516ec4acd0
Eat a lockign exception that kills scripts. May bear more investigation
...
in the long run.
2010-07-25 08:11:39 +02:00
aa7cadca52
Add some options
2010-07-24 23:36:07 +01:00
a9b7774fe0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-24 23:15:38 +01:00
4dbff62ef5
Fix some inventory issues
2010-07-24 23:15:06 +01:00
83aec1ec94
Fix a little infinite recursion i added just for sh.ts and giggles. NOT.
2010-07-22 23:47:10 +02:00
7ebabf185e
change the delay to 0.2s. My bad.
2010-07-22 19:31:02 +02:00
ce8b9b4181
LSL compatibility fix. Add 0.1 s sleep to llSetLinkPrimitiveParams so fade scripts will time correctly. The -Fast version works without a delay
2010-07-22 19:20:09 +02:00
0c0ac65d38
Added ': ' to password prompt. Mantis #4851
2010-07-22 04:00:24 -07:00
a70c7756b3
Add sending of the avatar interests and configuration of the profiles
...
module as an OpenSim profile module to Simian grid services.
Patch by Dimentox, thank you.
Applied with changes.
2010-07-22 03:01:50 +01:00
fb89d0ff4e
Allow megaregions to be used in M7, should we so decide
2010-07-21 12:32:23 +02:00
d4022becc3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-21 12:16:30 +02:00
f63a4c8f2f
Merge branch 'master' into careminster-presence-refactor
2010-07-21 12:03:44 +01:00
c72c84b455
Refine autoreturn a bit
2010-07-21 12:16:17 +02:00
ac1a34714d
Allow Megaregions to start properly after an unclean shutdown
2010-07-20 23:24:04 +01:00
f08afc4f87
Restore lines that have been removed due to previous merge conflict.
2010-07-20 14:28:17 -07:00
4ccc141764
Resync with master
2010-07-20 21:49:31 +01:00
c0b8cbd85b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:47:53 +01:00
dcf7973c9b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:39:20 +01:00
176cb01130
Remove a merge artefact
2010-07-20 21:38:31 +01:00
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
120d7014fd
When a god uses mass permission setting, the V bit is cleared from next
...
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
2010-07-20 21:01:46 +01:00
ea51bea508
prevent hacked viewers from being able to delete arbitrary items from any
...
prim. Allow friends with perms and shared group members to move or copy
things out of prims
2010-07-20 21:01:14 +01:00
78605baab3
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-20 21:00:56 +01:00
e46c0a0fc9
adjust DialogModule to only send broadcast alerts to root agents
2010-07-20 21:32:13 +01:00
7c124a5543
Relaxed the ultra-conservative lock on m_items. Needs testing under linux and stress.
2010-07-20 05:59:18 -07:00
fd66ee57f3
When a god uses mass permission setting, the V bit is cleared from next
...
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
2010-07-20 14:45:46 +02:00
b7f1288361
Adding it again.
...
Revert "Reverting this for now, but this needs to go in again."
This reverts commit c0d9ab941d
2010-07-20 04:23:39 -07:00
c0d9ab941d
Reverting this for now, but this needs to go in again.
...
Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks."
This reverts commit ffbae52a13
2010-07-19 16:22:29 -07:00
191bee2ed0
Remove the null checks altogether
2010-07-20 00:55:31 +02:00
54da64acac
Remove exception badness in the LSL Types. Who ever came up with that.....?!
2010-07-20 00:46:39 +02:00
ffbae52a13
Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks.
2010-07-19 15:20:34 -07:00
5c0c7fda6c
One more stab at http://opensimulator.org/mantis/view.php?id=4858 .
...
Eliminated the nested locks of m_Scripts and m_PrimObjects.
2010-07-19 13:59:11 -07:00
cd2bb7daf3
Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests indicate that this is what causes deadlock. More tests needed.
2010-07-19 08:07:37 -07:00
a974704a3e
re-add the sleep lost in the revert.
2010-07-19 14:37:27 +01:00
575f7d3366
Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage"
...
This reverts commit c404c5fb54
2010-07-19 14:36:53 +01:00
fa45d5b5fa
Revert "A stab in the dark. Revert the compile lockout temporarily. If you know what"
...
This reverts commit f798679b80
2010-07-19 01:10:57 +01:00
f798679b80
A stab in the dark. Revert the compile lockout temporarily. If you know what
...
this is, you should test it. If you don't, don't use it.
2010-07-19 00:06:23 +01:00
c263fc54ac
Add a state change method to the Async commands handler to allow timers
...
and http requests to survive state changes
2010-07-18 21:05:50 +02:00
c088397ec7
If the client requests that an object be deleted, and the SOG/SOP is null and/or is marked as deleted, just send the KillObject
2010-07-18 06:01:26 -07:00
fabe2206db
Ensure that packets do NOT get delivered to a client before the modules that can deal with the client's response have finished loading.
2010-07-17 15:08:59 -07:00
17412389f3
Revert 233c872.. "* Call client.Start() sunchronously. Calling thos async avoids some stuttering", pending fix for the core issue
2010-07-17 14:34:35 -07:00
7b62c25cfb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-17 16:25:56 +01:00
e157dd630e
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:25:30 +01:00
d52fb4d2e9
Shorten LLEmail delay to 15s. With the external spam protection, we can
...
afford to do that
2010-07-17 16:35:14 +02:00
c41d418380
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:32:55 +02:00
d1040c9ff9
Replace the screenful of code i deleted.
2010-07-17 02:46:04 +02:00
e06b7ee368
Make webloading more robust by addign retries
2010-07-17 02:38:00 +02:00
85f454e3ae
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-17 02:26:34 +02:00
9bf6179d24
Fix scripted give of items
2010-07-17 02:26:09 +02:00
9cfa71d1bf
Allow use of old angle rules PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE in llParticleSystem()
...
This is a patch from http://opensimulator.org/mantis/view.php?id=3201
Thanks Micheil Martin!
2010-07-17 00:35:51 +01:00
e05f01e70f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-17 00:27:52 +01:00
f5bdf0d9b9
Fix bugs in llRot2Euler()
...
Applies patch in http://opensimulator.org/mantis/view.php?id=4482 .
Thanks Micheil Merlin!
2010-07-17 00:26:26 +01:00
236c0f8e8b
Fix llSetForecAndTorque([0]) stops linear motion. Mantis #187
2010-07-16 22:17:06 +00:00
2e5f200b3b
Fix showing CreateSelected on all parts of a rez
2010-07-16 20:23:41 +02:00
3f91805afb
prevent hacked viewers from being able to delete arbitrary items from any
...
prim. Allow friends with perms and shared group members to move or copy
things out of prims
2010-07-15 20:28:18 +02:00
8d2b4b7b48
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-15 20:03:08 +02:00
99a6950b30
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 23:29:04 +01:00
466254105c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-14 23:04:25 +01:00
264f4f07cd
Detach attachments displaced by other attachments
2010-07-14 23:04:05 +01:00
0d8c0811d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 14:48:14 -07:00
6afa55d446
Removed a few obsolete mono addin references. Mantis #4854
2010-07-14 14:47:01 -07:00
8c10cb5ffe
improve closing of load/save iar streams in the event of a problem
2010-07-14 20:43:35 +01:00
ddfff55cc7
Preserve attachment data while a prim is in world. Allows attachment
...
editing on the ground without losing attachpoint and position
2010-07-14 21:06:49 +02:00
e1ea82b329
Major attachments cleanup. Remove unused AttachObject ClientView method
...
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:51:12 +01:00
a7b5fe6a88
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:49:54 +01:00
d665f0ae66
Detach attachments displaced by other attachments
2010-07-14 20:46:26 +02:00
0b74662ce2
Merge branch 'master' into careminster-presence-refactor
2010-07-14 19:53:15 +01:00
b8aa81635f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 11:04:57 -07:00
12858122d5
Fixes mantis #4870 .
2010-07-14 11:02:41 -07:00
bebbe407ee
Major attachments cleanup. Remove unused AttachObject ClientView method
...
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:58:23 +02:00
0c445239a6
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:21:01 +02:00
5b03e05035
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 17:55:06 +01:00
5d83b3f991
comment out obsolete assert that 'item has been passed to another user since it was last set' perms flag was set when a prim item was added to a scene object
2010-07-14 17:53:43 +01:00
0080c3b1f4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 17:13:04 +01:00
71433075a9
Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars
2010-07-14 17:12:12 +01:00
39cd57598b
Fix a permissions issue
2010-07-14 16:12:44 +01:00
d1f94b5d58
Merge branch 'master' into careminster-presence-refactor
2010-07-14 16:12:14 +01:00
cbb3a8ab94
Fix a permissions issue
2010-07-14 16:21:55 +02:00
33aa7ba7dc
Revert "More on mantis #4869 . This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing."
...
Cuauses a permission escalation. do NOT USE the preceding commit
2010-07-14 14:59:34 +01:00
bec1d7cc36
Removed left-over debug messages.
2010-07-14 07:00:24 -07:00
87fb19162e
More on mantis #4869 . This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing.
2010-07-14 06:57:56 -07:00
d64c09160c
Removed some more debug messages.
2010-07-14 04:18:13 -07:00
cd8bb316ea
Remove getting the object capacity from the money module. It is now set
...
directly from the Region Info (and the region ini file)
2010-07-14 03:51:00 +01:00
af13c80d68
Remove getting the object capacity from the money module. It is now set
...
directly from the Region Info (and the region ini file)
2010-07-14 03:59:26 +02:00
c5891c14c7
Bail out in AttachToBackup if the group is an attachment
2010-07-13 15:32:35 -07:00
7270cd0ade
Second part of the fix for llGetLocalPos; get attachment offset in the root prim of an attachment. This function now behaves in line with SL.
2010-07-13 14:57:50 -07:00
8c2e1c6c29
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-13 21:12:01 +00:00
8c26c8bbc6
adding the 'wearble' case for llGetLocalPos.
...
Still not working cause the offsets are not updated (always <0,0,0>)
2010-07-13 21:10:26 +00:00
84227fd558
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-13 20:37:45 +00:00
7ab103c96f
Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes occasional collision event failure. ChOde only.
2010-07-13 20:37:13 +00:00
eacf3d9221
Merge branch 'master' into careminster-presence-refactor
2010-07-13 20:46:21 +01:00
dd14016885
Revamp the permissions propagation. This MAY mess up. Please test.
...
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:45:16 +01:00
bed36901d1
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 20:37:12 +01:00
89c1c5c35a
Revamp the permissions propagation. This MAY mess up. Please test.
...
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:40:23 +02:00
31cbd6d113
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 18:23:23 +02:00
86f3f83250
uncomment a load iar code line I accidentally commented in the last commit
...
hooray for automated tests
2010-07-12 23:37:08 +01:00
3156f4bbeb
comment out a lot of the debug log messages when loading an iar
...
these are very redundant now and cause issues when loading large iars
diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
2010-07-12 23:00:01 +01:00
5f4105d48c
Removed the CHANGED_COLOR event post from the Color accessor in SOP. This is not the correct usage of this changed event - it's only supposed to be posted when the /textures/ change colour or alpha transparency, not the floating text. This fixes several race conditions in scripts ported from SL.
2010-07-12 13:55:56 -07:00
26621ca500
Add scripted controllers into agent intersim messaging
2010-07-11 14:50:14 +01:00
7f0f11304f
Add scripted controllers into agent intersim messaging
2010-07-11 14:26:57 +02:00
922e874653
Merge branch 'master' into careminster-presence-refactor
2010-07-11 13:32:10 +01:00
eaea89bbb7
Remove localID from script controls data. It won't transfer to another
...
region anyway
2010-07-11 13:09:11 +01:00
cea856cfc2
Fix the synchronousrestformsrequester so it will successfully handle a response from a server which does not provide a valid content length header
2010-07-10 19:00:12 -07:00
cecd660388
Fix an issue where the SynchronousRestObjectRequester will fail if a webserver does not report a content length (-1), but the content is still valid
2010-07-10 18:48:49 -07:00
1169bfeaf3
Make taken items go back to the folder they came from
2010-07-10 10:43:34 +01:00
8aa5f30082
Make taken items go back to the folder they came from
2010-07-10 10:51:49 +02:00
6352fc5f57
Bug in 0.6.9 sometimes restoring script state causes region console to crash due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically.
2010-07-09 18:23:48 +01:00
fe60b6783d
Hopefully fixes mantis #4852
2010-07-08 16:21:01 -07:00
d2fea2bb29
These 2 files want to be committed.
2010-07-08 16:05:59 -07:00
05b35eb57c
Correct a merge artefact
2010-07-08 18:17:02 +01:00
df9d4cd9b2
llVecNorm() now returns a zero-length vector when one is supplied as input. Addresses Mantis #4752
2010-07-08 10:06:08 -07:00
815dd73cf3
fix a potential division by zero
2010-07-08 10:01:23 -07:00
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
baebefeb05
Handle a specific exception without spewing red ink.
2010-07-08 16:30:36 +01:00
32cfdb0f6a
Switched order of conditionals.
2010-07-07 02:40:51 -07:00
07559707c5
Fixes problem where "Adult" regions were reported as being of type "Unknown".
2010-07-07 02:37:22 -07:00
faaef1b498
minimizes temp garbage for llParseStringKeepNulls()
...
and uses common routine for llParseStringKeepNulls()/llParseString2List()
2010-07-06 23:59:06 +00:00
6e7f1a3ac1
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
2010-07-06 02:23:10 +00:00
90c5555d6d
rewrote hanging llParseStringKeepNulls()
2010-07-06 02:22:47 +00:00
657056a73f
Fixes mantis #4845
2010-07-05 08:48:02 -07:00
debc780654
Fixes additional bug reported in mantis #4841 .
2010-07-05 07:14:32 -07:00
e947d04038
Undo fix is now complete. This commit repairs the special case of the root prim moving or rotating independently of the rest of the group.
2010-07-05 05:44:35 -07:00
7525f3a556
Don't include hyperlinks as neighbors, even if grid operators have done the mistake of placing them as neighbors. This will not prevent further mess ups coming from that unsupported action.
2010-07-05 04:19:53 -07:00
be5dd04150
Bring "Redo" up to date with "Undo" so it works too
2010-07-05 03:58:18 -07:00
c7e4880a5e
One more buglet fixed related to mantis #4841 -- auto-returns were still chocking on a null pointer exception.
2010-07-05 03:36:26 -07:00
8849b9af8b
Fix single prim rotation undo. All UNDO functions are now working correctly except for when the root prim is moved or rotated as a single prim (coming soon).
2010-07-04 20:45:11 -07:00
c616335019
Rotation undo fix and remove a debug chatter i missed. Still not working: Individual child prim rotational undo and special cases where the root prim was moved or rotated (all the children then need to restore their offsets). Coming shortly.
2010-07-04 19:58:52 -07:00
5b68343361
The majority of the Undo fix. There is still an issue with Rotation which i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging.
2010-07-04 19:28:39 -07:00
7665013ad8
Correct positioning of timeout modifier in the SynchronousRestObjectRequester
2010-07-04 19:25:54 -07:00
b84f72df0b
Got rid of all hyperassets references. Also fixed accessing textures in user's inventory in foreign grids.
2010-07-04 14:59:15 -07:00
02a15bc787
Started to clean up the mess with HyperAssets in LLClientView. Fixed HG access to Notecards in user's inventory.
2010-07-04 13:56:03 -07:00
14ab22dcd4
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-04 06:51:01 -07:00
3368e3853a
Check cached asset to make sure it contains data, and if not, re-request
2010-07-04 06:45:04 -07:00
8a45191aa9
Merge branch 'master' into careminster-presence-refactor
2010-07-04 11:02:21 +01:00
abe0a9ff49
Fixes the obvious problem in mantis #4841 . Melanie needs to look at other potential problems there, though.
2010-07-04 02:59:38 -07:00
baa20a10c3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-03 20:29:06 +02:00
edcfaf60c9
Fix IMs the right way. This sets it up so that timestamps are actually
...
in PST (to match viewer time), does correct storage and retrieval of
IMs, corrects the session ID and makes sure IMs don't get marked "saved"
if they're live. Removes the group IM save option, which our group IM
module never had in the first place, as saving group chatter makes no
sense at all.
2010-07-03 20:27:00 +02:00
4cd5e64231
Use SendTransferAbort in a more sensible place
2010-07-03 09:22:58 -07:00
e4739523d3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-03 06:11:46 -07:00
fe2b044d38
Fix Undo! Made a lot of changes to Undo state saving; it now considers that groups of objects can be moved and not just individual prims..
2010-07-03 06:10:55 -07:00
39ae1def85
Re-implement the Undo stack as a List; the old implementation was buggy
2010-07-03 06:10:02 -07:00
2b49cb9227
Make sure the AssetServiceConnector times out within 30 seconds. If it doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue.
2010-07-03 06:09:20 -07:00
3d495b709e
Implement a timeout value in the SynchronousRestObjectRequester. Default is 100 seconds.
2010-07-03 06:08:18 -07:00
028303c3e1
Fixes mantis #4835
2010-07-03 02:44:28 -07:00
86a82e6ecb
Now, fix the slash issue the right way. Our URLs now work like SL's
2010-07-03 08:33:08 +02:00
721d8a7298
Re-add the slashes at the end of the URL. Too much depends on them
2010-07-03 07:09:27 +02:00
79c1eb1e39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-02 06:36:08 -07:00
490f1c144c
Fixes mantis #4782
2010-07-02 06:35:38 -07:00
233c872d24
Call client.Start() sunchronously. Calling thos async avoids some stuttering
...
when people log in, but fatally screws up money.
2010-07-02 09:40:58 +02:00
e15f6905a5
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:13:58 +01:00
c87e6a289c
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:20:36 +02:00
fda9d7b75e
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:45:03 +01:00
9e0b562c6e
Fox another scripting nasty. Stuff no system.string objects into lists
2010-07-02 04:21:07 +01:00
e328c23355
Add MapTileURL to robust to supply the url needed by snowglobe
2010-07-02 04:03:35 +01:00
beb5259cd1
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:51:31 +02:00
a7c4cb95aa
Fox another scripting nasty. Stuff no system.string objects into lists
2010-07-02 04:26:55 +02:00
848623eea5
Fix a dumb little sign error that makes a LSL wiki example fail
2010-07-02 03:04:43 +01:00
120c9a4ebb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-02 03:11:18 +02:00
ec73074aac
Merge branch 'master' into careminster-presence-refactor
2010-07-02 03:02:53 +01:00
60c15d7c28
Fix a dumb little sign error that makes a LSL wiki example fail
2010-07-02 03:05:40 +02:00
54d7f6ef43
Add region name on the end of script startup debug messages
2010-07-01 21:34:53 +01:00
68281b356c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-01 09:47:18 -07:00
071d601dcb
Cache all assets on upload so that the client can still retrieve the asset if it enters a retry queue
2010-07-01 09:46:57 -07:00
b38a22506b
Fix build break
2010-07-01 08:57:13 -07:00
38384cc79c
Report asset upload success if it has previously failed
2010-07-01 08:52:30 -07:00
4851706d35
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-01 08:49:53 -07:00
1cb7695fb0
Catch newid == null which is what happens if the asset service is offline (seems a connection failure does not throw an exception)
2010-07-01 08:48:02 -07:00
3d5d44279b
ANother stab at LSL compatibility
2010-07-01 17:06:29 +02:00
2312504b04
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-01 16:41:03 +02:00
d5cbe4cb75
Remove trailing slash from HTTP URLs to be compatible with SL
2010-07-01 16:40:26 +02:00
3940a4dbc7
Avoid a spurious error message when taking a friend's no copy item
2010-07-01 16:11:10 +02:00
8326f36cda
minor: comment out high volume texture serving module debug message
2010-06-30 22:07:28 +01:00
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +01:00
dd579cf615
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-30 21:26:43 +01:00
1db2921782
Fix scripts in rezzed objects not starting (Mantis #4775 )
2010-06-30 21:25:39 +01:00
b6264e60d3
Removed opportunity for exception in BaseHttpServer. (mantis #4825 )
2010-06-30 06:35:22 -07:00
9012084d11
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-29 23:19:08 -07:00
8dc7c0849e
The other half of the asset fix. Implement an exponentially incrementing retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets.
2010-06-29 23:18:48 -07:00
5925aac859
Add --merge switch to load iar.
...
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
2010-06-30 00:10:44 +01:00
be0af01061
Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations"
...
This reverts commit 94cb6fc916
2010-06-29 23:43:38 +01:00
714367efb9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 21:51:56 +01:00
d06b977ed1
Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure.
2010-06-29 14:21:48 -07:00
6701fc2ffa
Fix the XML serializationt to provide an empty script state element if
...
the script hasn't yet saved state, or can't save state because of a loop
2010-06-29 21:50:52 +01:00
5d11833ae1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 20:36:36 +01:00
94cb6fc916
stop exceptions in setting and getting state from propogating since they aren't fatal to operations
...
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 21:08:09 +01:00
5964084d25
Fix a nullref on autoreturn
2010-06-29 20:36:17 +01:00
c607e6f3b8
Revert "don't report the null uuid as a missing asset on saving oars/iars"
...
This reverts commit 5ce119174e
2010-06-29 20:30:22 +01:00
cf15558c9e
This file wants to be committed.
2010-06-29 06:25:12 -07:00
fa3f448324
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-29 04:40:02 -07:00
08e3389790
Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase".
2010-06-29 04:38:15 -07:00
9fde9085a0
Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken comments in InventoryAccessModule.
2010-06-29 02:07:10 -07:00
3cd717d929
Comment the "Notecard saved" notification that pops up when a notecard
...
is saved into a prim. Sl doesn't have it, and for good reason: It also
happens on scripts in our version. Which is wrong. Better no message
than a wrong one.
2010-06-29 04:09:14 +02:00
6f4d4543b9
Make newly created prims be named "Object" and make newly created scripts
...
have a default touch handler. Compatibility patch
2010-06-29 03:51:16 +02:00
621195e4f1
Thanks Micheil Merlin for Mantis #4784 : [PATCH] llRotBetween does not return correct rotations for a 180 degree angle between vectors
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-06-28 17:33:47 -07:00
d123350164
One more bug fix in FriendsModule: GrantRights. One of the caches was not being updated.
2010-06-28 16:04:12 -07:00
20fc35399b
Fixes mantis #4815 and #4812
2010-06-28 14:10:22 -07:00
06fa038875
Return a UUID.Zero if the asset fails to upload
2010-06-28 07:09:05 -07:00
a5a1df68c2
Provide the interface for StoreAsset to report success or failure
2010-06-28 04:02:33 -07:00
3e908023b2
Force IM timestamps to current server time to prevent "Saved on" headers
...
while the sender is online
2010-06-28 08:58:51 +02:00
7807d11807
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-27 22:23:08 -07:00
827d9be48f
Fix the sound issue. It was caused by missing assets; once the client has made one request, it continued to wait for asset before requesting any new ones, until the TransferRequest timed out. Fixed by adding a TransferAbortPacket if the asset cannot be retrieved.
2010-06-27 22:23:01 -07:00
0a82d10fc4
Change the way IRegionModule us referenced by IEmailModule to
...
allow later conversion to new style
2010-06-28 03:14:05 +01:00
85a9c305a2
Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
...
used, but made for a very mispleading read of the code in the callers.
2010-06-28 01:43:26 +01:00
4cdda2cae9
Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
...
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:36:40 +01:00
4fa1d4896c
Change the way IRegionModule us referenced by IEmailModule to
...
allow later conversion to new style
2010-06-28 02:30:36 +02:00
a817f6b48c
Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
...
used, but made for a very mispleading read of the code in the callers.
2010-06-28 01:48:24 +02:00
d570cffa39
Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
...
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:29:30 +02:00
1499fd85c4
Fix a simian compiler warning
2010-06-27 21:02:03 +01:00
660a560d3b
Make drag copy and copy-on-ray handle friends list perms properly
2010-06-27 20:59:51 +01:00
6cf0b8f6fe
Add command-script to the Robust console
2010-06-27 13:28:27 -07:00
3dbc736049
Addresses mantis #4789 . Not really a fix, because the event is harmless anyway. Just shouldn't happen normally.
2010-06-27 13:23:51 -07:00
a61d817978
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-27 13:07:44 -07:00
7868f1f650
Fixed Robust.32BitLaunch.exe
2010-06-27 13:06:39 -07:00
76d2f0f68e
Same patch as before but for SQLite.
2010-06-27 12:40:17 -07:00
b0129b35f8
Added checks to XInventory DB layer to truncate names and descriptions.
2010-06-27 12:37:16 -07:00
3612a5252b
Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
...
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:23:33 +01:00
121ba7e95c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-27 20:05:29 +01:00
2cced72d70
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-27 21:05:06 +02:00
9c553cd254
Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
...
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:20:08 +01:00
ba38c697e8
Merge branch 'master' into careminster-presence-refactor
2010-06-27 20:05:55 +01:00
205d2496f6
Fix permission propagation to prevent permanently locked objects from being
...
created.
2010-06-27 20:04:39 +01:00
19f18c8a1b
Make drag copy and copy-on-ray handle friends list perms properly
2010-06-27 21:04:30 +02:00
ef0ac7c403
Deal with incoming land objects properly so they don't just stack up
2010-06-26 23:20:28 -07:00
9f00f141fe
Restore "AllowCareminsterFunctions" as an alias to the new "AllowLightshareFunctions".
2010-06-26 18:54:55 -07:00
592ff1288d
Add a new global event : OnTerrainUpdate
2010-06-26 18:51:19 -07:00
c97e9f8621
Reverting the ITerrainModule changes. Turns out this was useless.
2010-06-26 18:43:01 -07:00
3bcee57e3e
add HasChanged to ITerrainModule
2010-06-26 17:34:19 -07:00
c3e806a2ea
Add a new accessor for the TerainModule : "HasChanged"
2010-06-26 17:25:45 -07:00
49272657d7
Make RegionLightShareData serializable
2010-06-26 15:30:47 -07:00
8f0adfbfb2
Trigger the RegionLightShareData OnSave event properly when the profile is saved
2010-06-26 15:15:19 -07:00
d188ed8ed8
Return everything at once, it's more efficient that way
2010-06-26 13:07:17 -07:00
ed5dac7e82
Fix another nullref issue in DeRezSceneObject
2010-06-26 13:06:47 -07:00
bd19cf739a
Fix a bug with DeRezObjects (check for a null remoteClient)
2010-06-26 12:38:08 -07:00
acab2a159d
Return objects which are NoCopy instead of just leaving them when cleaning the scene, if exceptNoCopy = true.
2010-06-26 11:24:36 -07:00
70d3b9aeca
Add a DeleteAllSceneObjects(bool exceptNoCopy) method to allow NoCopy objects to be retained when the scene is cleared.
2010-06-26 11:14:58 -07:00
06fd49bda9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-26 06:17:09 +02:00
6274317e63
Fix loading of attachments on login
2010-06-26 06:16:24 +02:00
f64d1cb396
Add new event: OnChangedBackup
2010-06-25 14:39:15 -07:00
30397b6fbc
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-25 14:26:07 -07:00
96e649189f
Add two events: OnAttachToBackup and OnDetachFromBackup.
2010-06-25 14:25:39 -07:00
a4a808818f
don't report the null uuid as a missing asset on saving oars/iars
2010-06-25 21:48:19 +01:00
d399bd3eb7
minor: fix spelling mistake interupt -> interrupt in migrations
...
This is for mantis 4783
2010-06-25 21:18:52 +01:00
4a5979c311
minor: remove some mono compiler warnings
2010-06-25 21:09:15 +01:00
c7e7cb04a3
fix web request exception reporting properly this time
2010-06-25 20:57:38 +01:00
8629ba80bf
Revert "Report http server onRequest() exception properly."
...
This reverts commit c09451a034
2010-06-25 20:51:21 +01:00
dc9e9931eb
Merge branch 'master' into careminster-presence-refactor
2010-06-25 20:26:48 +01:00
c09451a034
Report http server onRequest() exception properly.
2010-06-25 19:11:22 +01:00
52b711af82
stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent isn't present in the presence dictionary
...
the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
2010-06-25 18:55:20 +01:00
2c4df19805
minor: Move log information about SYSTEMIP to the place where it's resolved
2010-06-25 18:29:02 +01:00
3101d53064
Make "Allow other residents to edit terrain" default to FALSE
2010-06-25 05:25:41 -07:00
afff74a835
Add DwellModule interface
2010-06-25 01:44:17 +02:00
8a0ec60c8f
Unhook the dwell request from the land module (and therefore local storage)
2010-06-25 01:41:00 +02:00
6848465ae2
* SimianAssetServiceConnector Delete() was expecting the wrong type of response, reporting false errors
...
* Fixed a typo in a WebUtil error message
2010-06-24 13:43:38 -07:00
f186882c0f
Also make prims send the proper position. I hate it when people comment
...
out things just because they're "not yet used". Grrrr.
2010-06-24 20:51:04 +02:00
cbca58401a
Add the object owner UUID into the binary bucket of object to user IM
2010-06-24 20:46:24 +02:00
2cc1f14b0c
Replace the imSessionID, which is useless out of context, with the scope id
...
in saved IMs
2010-06-24 19:37:02 +02:00
b012e963d7
New viewers don't set the "save offline IM" flag anymore. Set it serverside
...
so messages get saved
2010-06-24 18:48:40 +02:00
6c37a02c0f
bug fix. 0,0 is a vlid sim coordinate
2010-06-24 06:02:44 +02:00
5a071dc798
Move loading of parcels to before script start. Scripts using parcel functions
...
can fail if no land is loaded
2010-06-24 03:24:38 +01:00
9d03271265
And another
2010-06-24 03:43:50 +02:00
e94cf3d9b7
And another conflict
2010-06-24 03:35:42 +01:00
e93853623b
Merge branch 'master' into careminster-presence-refactor
2010-06-24 03:30:11 +01:00
c404c5fb54
Thank you, Snoopy, for a patch to reduce sim script startup CPU usage
2010-06-23 21:14:28 +01:00
ce6fbd9680
Merge branch 'master' into careminster-presence-refactor
2010-06-22 23:40:59 +01:00
7db5262e35
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-22 23:40:12 +01:00
c96a6940a9
Line ending fix
2010-06-22 16:11:36 -07:00
1e1485de5b
* Fixed SimianGrid map tile uploads not having any objects in the images
2010-06-22 16:09:30 -07:00
68551675df
Guard prioritizer agains null values as those produced by a bullet dying
...
before it can be updated
2010-06-22 23:39:39 +01:00
854a8b9172
Security fix: Allow only textures to be fetched using HTTP texture cap
2010-06-22 23:39:25 +01:00
317ac50a97
Merge branch 'master' into careminster-presence-refactor
2010-06-22 23:38:56 +01:00
5c02fb435d
Security fix: Allow only textures to be fetched using HTTP texture cap
2010-06-22 17:35:00 +02:00
962dade155
Cause collisions with the avatar to be sent to attachments. Currently
...
ignores collision filter. Physics collisions are still dodgy, so we
don't get the events we should be getting.
2010-06-22 04:04:59 +02:00
3428196631
Guard prioritizer agains null values as those produced by a bullet dying
...
before it can be updated
2010-06-22 02:33:20 +02:00
3ea4e5ccbe
Correctly update the LastSeen field
2010-06-21 23:26:27 +02:00
53905cf919
Bump the migration version, ot it would never happen
2010-06-21 22:15:33 +02:00
ab023c6a29
Fix build break
2010-06-21 18:06:46 +02:00
9fd45406be
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-21 17:06:59 +02:00
973537f819
Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
...
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-06-21 17:06:05 +02:00
9d251b1dc5
Fix the StandUp position to calculate as if we're still using the child prim id.
2010-06-20 15:57:01 -07:00
fc715a092c
Fix the sit code to ensure that we use the root prim of a linkset as a reference in the case of an avatar sitting on a child prim. This fixes various camera issues and fixes mantis #0000059 .
2010-06-20 15:38:48 -07:00
33d05ef554
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-20 14:45:36 -07:00
a1416612a9
Update all clients sitting on a linkset if a child prim is moved. This prevents avatars being "lost in the void" until they stand up when a child prim is moved that they're sitting on.
2010-06-20 14:45:04 -07:00
13a0b65a80
Modify avatar responsiveness policy to send roots before children
2010-06-20 21:38:06 +02:00
797767da57
Insert a space after the comma on the ToString methos of lsl vectors
...
and rotations to match SL.
2010-06-20 07:16:19 +02:00
95c763201f
Set the offline flag in inventory offers
2010-06-20 06:36:46 +02:00
76b59b8df7
Make dataserver() return a 0 when agent id offline, instead of a timeout
2010-06-20 06:23:08 +02:00
905e5cd991
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-19 23:48:09 +01:00
c571c33b6b
fix faulty profile cut parameter checking in llSetPrimitiveParams() - see Mantis #4510
2010-06-19 16:07:35 -07:00
a3ebd4db3f
Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"
...
Didn't do what it said on the package!
This reverts commit 8643db3ef0
2010-06-19 23:45:56 +01:00
8643db3ef0
This is a HACK! Downright nasty. For some reason, the devs of the mysql
...
connector have decided that their vision of timeouts is the only valid one.
This uses reflection to show them the finger. Please test.
2010-06-19 22:48:43 +01:00
24a68e36fb
Bug fix: wrong name of requester in local friendship offer.
2010-06-19 12:32:36 -07:00
04b60aa490
Merge branch 'master' into careminster-presence-refactor
2010-06-19 20:32:01 +01:00
49d7d8534c
Allow moving an avatar as part of a linkset using llSetLinkPrimitiveParams. This unlocks an awful lot of poseball-free content, and is a step towards resolving mantis #59 .
2010-06-19 10:06:09 -07:00
1e7ce6dbce
Hunting for the problem in #4777
2010-06-19 09:44:02 -07:00
9b410f5e94
Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777 .
2010-06-19 09:25:36 -07:00
f0f684161e
Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis #4777
2010-06-19 08:57:58 -07:00
6d8da699b2
Add "AvatarHeight/2" to the Home Position when set to avoid having the avatar fall through the ground when they TP home.
2010-06-19 07:00:01 -07:00
891214c65b
Merge branch 'master' into careminster-presence-refactor
2010-06-18 20:49:21 +01:00
71a73d83cb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-18 19:50:01 +01:00
47d5f90629
Remove an error in meshing error reporting. Now doesn't double-bomb
...
anymore on a bad sculpt
2010-06-18 19:49:14 +01:00
71c8bbaf2c
Fix problem where iar load would duplicate huge number of folders
...
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
2010-06-18 17:37:28 +01:00
11a35d8cda
change TestPartExistingIarPath() to check appropriate folder creation
...
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
2010-06-18 17:10:16 +01:00
cf4721a92d
in IAR utils, return all folders that match a particular path rather than just the first one
2010-06-18 16:33:34 +01:00
cea7905602
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-17 13:04:32 -04:00
958c6c6fde
Add rez on water surface.
2010-06-17 13:04:18 -04:00
e3432b8f63
Revert "Set command timeout to infinity on migrations"
...
This reverts commit 51d30fd34a
2010-06-17 17:48:34 +01:00
51d30fd34a
Set command timeout to infinity on migrations
2010-06-17 17:43:40 +01:00
33c092781e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-17 04:15:56 -07:00
d1c8b083b8
Fix llRot2Euler with a mathematically sound implementation. The only difference between this an SL is that SL resolves a figure of negative PI into PI, and does the equivalent in the reverse (llEuler2Rot, -1.0 becomes 1.0);
2010-06-17 04:15:07 -07:00
8b3042f24f
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-17 03:09:17 +01:00
7e22be3441
Merge branch 'master' into careminster-presence-refactor
2010-06-17 03:08:55 +01:00
544627c79c
Force newly connecting remote consoles to display a prompt
2010-06-17 03:03:55 +01:00
b9c40320f1
Fix llAttachToAvatar. This addresses mantis 128 .
2010-06-16 09:20:20 -07:00
117fd629d6
Allow llMapDestination to be used in any event if the host is an attachment. This fixes Mantis 0000098.
2010-06-16 08:32:47 -07:00
0b75f759b4
Merge branch 'master' into careminster-presence-refactor
2010-06-16 04:10:55 +01:00
6c0a372346
* Support salted and unsalted password hashes in SimianAuthenticationServiceConnector
2010-06-15 17:46:36 -07:00
38f098588c
Fixes creation date issue on user accounts.
2010-06-15 16:36:22 -07:00
0031d4a618
Readjust master version and flavor
2010-06-15 01:53:11 +01:00
462a0f24e9
Merge branch 'master' into 0.7-post-fixes
2010-06-14 11:54:40 -07:00
9c9ce9e8dd
* Deleted duplicated migration that was failing anyway.
...
* Added an error message in initial estate owner creation that makes it clear what needs to happen.
2010-06-14 11:50:42 -07:00
ef1496ca2d
Add "alert dialog" for sending dialogs to users from the console
2010-06-14 04:28:38 -07:00
53c32d8773
osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down.
2010-06-14 12:09:35 +01:00
704da8c823
osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down.
2010-06-14 04:03:54 -07:00
c75b94f9f9
Merge branch 'master' into 0.7-post-fixes
2010-06-14 04:50:27 +01:00
bd346ab8c7
Fixes attachments coming back upon being detached in neighbouring regions and crossing.
2010-06-13 19:18:17 -07:00
19558f380a
Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.
2010-06-13 19:06:22 -07:00
fdf648bcf3
Merge branch 'master' into careminster-presence-refactor
2010-06-14 02:49:15 +01:00
9b30f44672
D.U.H. #2 . Inverted test. Again. Argh!
2010-06-14 02:28:31 +02:00
1532dbca0a
Guard against a potential nullref
2010-06-14 00:12:39 +02:00
f9b4f5f594
Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat position if"
...
This reverts commit f59e272643
2010-06-14 00:05:01 +02:00
5fda89fdb5
Revert "D.U.H."
...
This reverts commit 3058761806
2010-06-14 00:04:02 +02:00
093cc047cd
Revert "Try it witht he root prim"
...
This reverts commit d520360cb8
2010-06-14 00:03:43 +02:00
62763cc0fb
Report current position instead of position at the time we sat down
2010-06-14 00:02:17 +02:00
d520360cb8
Try it witht he root prim
2010-06-13 23:01:15 +02:00
9069114d0f
Fox my changes to radmin
2010-06-13 21:57:56 +01:00
14c587bea1
Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following
...
changes:
- Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it
- Adjusted comments to remove misleading or no longer true comments. Default
is neuter, according to the code, not male, as the comment stated.
2010-06-13 21:45:39 +01:00
3058761806
D.U.H.
...
un-reverse a reversed condition
2010-06-13 22:43:14 +02:00
520b0e131c
Try to make prims stop moving. Reset velocity, etc, unconditionally. Although
...
the phys actor may be new, the prim fields could still be set and the
slimupdates system would continue sending that data out.
2010-06-13 22:37:11 +02:00
3d319d6c3f
Actually update the SP. EXPERIMENTAL
2010-06-13 22:23:07 +02:00
f59e272643
Introduce SOP.UpdateSitters() to update sitting avatars' chat position if
...
needed
2010-06-13 22:21:05 +02:00
deaf6bff98
Merge branch 'master' into 0.7-post-fixes
2010-06-13 03:56:47 +01:00
b3594681a4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 12:09:06 -07:00
66619b5996
Added checks for failed UpdateAgent calls.
2010-06-12 12:08:45 -07:00
5e4bee0f34
Merge branch 'master' into careminster-presence-refactor
2010-06-12 19:15:59 +01:00
59acb37d92
Change name of method to better reflect what it does
2010-06-12 19:14:46 +01:00
b9c01a1c42
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 11:11:48 -07:00
e6efe34b4c
* Added CHANGED_TELEPORT event trigger upon inter-sim teleports.
...
* Cleaned up NewUserConnection.
2010-06-12 11:11:13 -07:00
4950ee5f3b
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 16:27:55 +01:00
d2342319da
Merge branch 'master' into careminster-presence-refactor
2010-06-12 16:27:37 +01:00
ceac35bac1
Log and eat sculpt meshing exceptions caused by bad jp2 data.
2010-06-12 16:25:40 +01:00
63531b1df5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 04:36:14 -07:00
3ea11fe2e6
Get rid of spamming SOG debug message
2010-06-12 04:35:51 -07:00
3c036934a3
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:28:00 +01:00
4c58ac2c90
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:35:03 +01:00
65f03af38f
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 07:34:55 +01:00
03a48f87e4
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:29:20 +02:00
e337c9130f
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:34:22 +02:00
57a60282f5
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 06:57:10 +01:00
0ece71f8d1
Merge branch 'master' into careminster-presence-refactor
2010-06-12 06:14:10 +01:00
92fea025cb
Resume scripts that have been rezzed from a prim
2010-06-12 06:13:27 +01:00
3c3ad08868
Merge branch 'master' into careminster-presence-refactor
...
0.7.1CM Dev
2010-06-12 02:46:11 +01:00
85d2e21558
Change trunk versio to 0.7.1 Dev
2010-06-12 02:45:21 +01:00
99f2a1c347
* Tweak the StopFlying() method in LLClientView to fabricate a suitable landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f
2010-06-11 21:46:01 -04:00
4dd9cf1ce4
Change flavor to 0.7-RC1
2010-06-12 02:44:01 +01:00
ae0a7e2c37
Merge branch 'master' into careminster-presence-refactor
2010-06-12 02:19:57 +01:00
508bfa1de8
Merge branch 'master' into careminster-presence-refactor
2010-06-12 01:26:55 +01:00
c8ed972443
Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet
...
we used to send before slimupdates and explicitly send it
2010-06-12 01:25:25 +01:00
6a2e0c707c
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:34:26 +01:00
ed38b4a140
Some people don't use Simian. Make the connector respect that it's disabled
...
and not try to send a map tile in that case.
2010-06-12 00:32:54 +01:00
836728e5de
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:08:20 +01:00
b5bc2816fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 15:43:22 -07:00
d1a324888b
* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
...
* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API
2010-06-11 15:37:25 -07:00
c61e998580
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-11 22:09:24 +01:00
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
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
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
8531da37d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 21:18:53 +01:00
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
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
4e34770aba
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:56:43 +01:00
556e91d33c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-11 12:48:06 -07:00
d184fef4dc
Inventory offers and subsequent notifications of acceptance/decline now working across the board.
2010-06-11 12:47:47 -07:00
1cfebca48d
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:35:00 +01:00
c98b10fc8c
Remove the cm* function namespace
2010-06-11 17:48:41 +01:00
7c4cf46bac
Rename CM files to LS
2010-06-11 17:42:41 +01:00
ad87bab271
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:30:23 +01:00
b64f42fa41
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:03:45 +01:00
be71a2e5bc
Revert "Remove the cm* function namespace"
...
This reverts commit ef93ac4452
2010-06-11 17:52:19 +02:00
b1224c3540
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-11 17:47:34 +01:00
aa2f5bdd77
Merge branch 'master' into careminster-presence-refactor
2010-06-11 17:46:29 +01:00
ef93ac4452
Remove the cm* function namespace
2010-06-11 17:48:33 +02:00
10ef80cf15
Rename CM files to LS
2010-06-11 17:42:16 +02:00
97d83c87ec
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:23:06 +02:00
8d5cec5e0d
Remove cmGetAvatarList()
2010-06-11 17:08:18 +02:00
b3cf5ccf6d
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:04:54 +02:00
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
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
b2b6799f1c
Added more debug messages to try to pinpoint where login is failing for nebadon.
2010-06-10 18:26:04 -07:00
e80cb815df
Bug fix on attachments: attach->drop->attach works now.
2010-06-09 12:51:24 -07:00
1dce243661
Merge branch 'master' into careminster-presence-refactor
2010-06-09 20:25:05 +01:00
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
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
8fc5eda2c9
Bug fix in attachments: when attaching from inworld the item's parentFolderID was wrong.
2010-06-09 10:55:37 -07:00
1be53b58a7
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:02:01 +01:00
30d3ea3d4b
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:00:24 +01:00
6b2d2413f7
Merge branch 'master' into careminster-presence-refactor
2010-06-09 16:48:37 +01:00
008e840cf2
Add the BEGIN; I had missed
2010-06-09 16:37:20 +01:00
668c3b4062
Re-add Migration version 32, which apparently got dropped completely.
2010-06-09 16:34:18 +01:00
796e9b5cb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-09 03:52:24 +01:00
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
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
0520b62955
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-08 15:52:56 -07:00
5c0068723f
Changed XInventoryData's CreatorID to a string.
2010-06-08 15:52:26 -07:00
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
20ea823c19
Merge branch 'master' into careminster-presence-refactor
2010-06-08 22:07:01 +01:00
933bfd17f7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-08 22:05:49 +01:00
a791689ceb
Make the text mode remote console really work. It can now be used to send
...
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:05:06 +01:00
7d75dc1294
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-08 22:04:09 +02:00
54209907f3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-08 16:15:45 -04:00
6e2cc98eac
Fixed llMoveToTarget() and Rotation Lock/Enable (ChODE/ODEPrim only)
2010-06-08 16:15:16 -04:00
4921d5ac2d
Make the text mode remote console really work. It can now be used to send
...
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:03:08 +02:00
24c36f26d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-08 20:07:50 +01:00
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
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
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
d2dfbbe339
Merge branch 'master' into careminster-presence-refactor
2010-06-08 00:44:53 +01:00
a246cbce8d
Add a migration to adjust types in the WL table. The new connector likes that
...
better
2010-06-08 00:37:38 +01:00
74d62901c8
Merge branch 'master' into careminster-presence-refactor
2010-06-07 00:44:36 +01:00
d91bd7646d
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:11:30 +01:00
fad5158ab4
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:09:44 +02:00
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
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
e962c44749
Fix support for PRIM_SCULPT_FLAG_INVERT and PRIM_SCULPT_FLAG_MIRROR in the llSetPrimitiveParams series of functions. This makes it possible to mirror a sculpt by script.
2010-06-04 19:36:31 -07:00
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
3c3df9f3e9
refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()
2010-06-04 23:34:42 +01:00
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
0526d3a535
bring TestLoadIarV0_1AbsentUsers() back online
2010-06-04 21:19:37 +01:00
a08ace300b
bring TestIarV0_1WithEscapedChars() back online
2010-06-04 21:15:25 +01:00
c5878b6610
Merge branch 'master' into careminster-presence-refactor
2010-06-04 21:11:15 +01:00
f523c2033d
bring test TestLoadIarV0_1ExistingUsers() back online
2010-06-04 21:11:13 +01:00
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
f319d2ef5e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-04 20:44:01 +01:00
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
281eb0c626
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-04 11:00:29 -07:00
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
86f2339b6e
remove estate stuff in sqlite region migrations since this also exists in estate migrations, change Sandbox to sandbox in sqlite region migrations
...
re-enabling the sqlite data tests revealed these errors!
2010-06-04 18:46:58 +01:00
5c322335e5
add sqlite database back to database tests
...
this appears to be okay even though we reuse it between runs without deleting it first.
size of the database appears not to be changing though that could be deceptive
2010-06-04 18:27:16 +01:00
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
55040a84a5
Fix bug where prim items were not loaded in the new sqlite database handler
...
This addresses mantis http://opensimulator.org/mantis/view.php?id=4739
2010-06-04 17:14:12 +01:00
dda7185b43
Change the admin kick message to something more generic, "OpenSim Manager" is not really accurate
2010-06-03 17:55:50 -07:00
293f775fa5
Always provide at least 2 packets of a texture (if the texture is larger than 1 packet). This fixes compatibility with the newer (broken) SnowGlobe and Emerald viewer(s), but also matches the behaviour of SL.
2010-06-02 07:59:18 -07:00
b198763d67
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-02 01:22:10 +01:00
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
53e96dccef
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:21:50 +01:00
655f02b695
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-02 01:05:36 +02:00
70aa965c26
Add a forgotten security check. Make the new functions only work on prims
...
owned by the host prim owner.
2010-06-02 01:04:17 +02:00
d8962ef415
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:01:56 +02:00
d740035ef4
Applying patch from coyled to fix IAR support with the SimianGrid connectors
2010-06-01 13:32:14 -07:00
90c814a7ca
Fix nullref in cmGetAvatarList() (ported from 0.69)
2010-06-01 13:29:12 -07:00
a863eb9da3
One should not lock null objects.
2010-06-01 19:01:57 +01:00
6668c789d3
One should not lock null objects.
2010-06-01 19:01:21 +02:00
9c3c020697
Lock the object queue when dequeueing
2010-06-01 15:08:45 +01:00
c900134f91
Lock the object queue when dequeueing
2010-06-01 16:03:53 +02:00
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
16d8602d3c
Fix prim returns I broke earlier
2010-06-01 03:17:21 +02:00
4867dd135d
Fix prim returns I broke earlier
2010-06-01 02:12:56 +01:00
a5728cc91c
Fix prim returns I broke earlier
2010-06-01 02:10:53 +01:00
f29cb57bf1
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:10:22 +01:00
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
2fce7d9bcf
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 02:10:08 +01:00
eca15cfbf2
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 02:45:14 +02:00
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
bf233ea0dc
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:27:30 +02:00
f57f2370f1
Add a method to get the bounding box and root prim offsets within it for
...
a group of prims.
2010-06-01 01:25:24 +02:00
70f7790413
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 01:07:46 +02:00
9d4913224f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-31 19:00:36 +02:00
d4b4cbf5a5
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 19:00:02 +02:00
e515467c5e
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 17:55:56 +01:00
6c1665bf46
Fix casting in llParcelMediaCommandList so that it actually, you know, works
2010-05-31 08:38:41 -07:00
bbb4d6e4c9
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-31 01:02:04 +02:00
8df9f272eb
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-30 23:57:13 +01:00
890f3cc54c
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 15:46:54 +02:00
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
59a5367433
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 13:46:05 +02:00
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
84e30bee6d
Revert "Meta7 Communities : Authorization service added, skeleton, not yet functional"
...
This reverts commit 31439293cc
2010-05-29 12:34:02 +02:00
31439293cc
Meta7 Communities : Authorization service added, skeleton, not yet functional
2010-05-29 03:56:34 -07:00
e3dac1292e
Implement suspended updates - When an operation is occurring on lots of prims in a single group, don't schedule any updates until the operation has completed. This makes things like llSetAlpha(LINK_SET,0.0,ALL_SIDES); a *lot* faster, more efficient and less buggy, and also makes unlinking a lot better. Linking is still treacherous.. this needs to be analysed.
2010-05-29 02:10:34 -07:00
3a5d379db8
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-29 01:07:19 -07:00
2f409116db
Stop IGridService from throwing a fatal exception when an IPEndPoint cannot be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad.
2010-05-29 01:03:59 -07:00
e7bf6afd3a
Get the user's DOB back from the server response properly.
2010-05-29 05:14:18 +02:00
cd77648f48
Get the user's DOB back from the server response properly.
2010-05-29 04:09:47 +01:00
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
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
a60ca5236c
restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to work with the new UserAccountService/InventoryService
2010-05-28 21:37:48 +01:00
0ef41e62bc
minor: move a method so that the #regions make more sense
2010-05-28 21:18:55 +01:00
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
3c0f34bc2b
If a command has descriptive help, add a line above and below the print out for readability
2010-05-28 20:51:02 +01:00
2e2f73bdd5
minor: remove mono compiler warning
2010-05-28 20:12:06 +01:00
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
14c39461c2
minor: remove mono compiler warning
2010-05-28 19:41:13 +01:00
b1298fca0a
tidy up help information on load oar and save oar
2010-05-28 19:36:30 +01:00
d72435693b
refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers
2010-05-28 19:21:00 +01:00
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
1042ce7283
comment out large chunks of appearance/inventory region access services to eliminate warnings that this code is unused
2010-05-28 18:42:25 +01:00
565db4635f
add a smidgen more log debug information in the form of the operating system version
2010-05-28 18:30:33 +01:00
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
596001632b
remove redundant ScenePresence.QueuePartForUpdate() - every place in the code calls SceneViewer.QueuePartForUpdate() directly
2010-05-28 17:53:57 +01:00
9ea42fdfab
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
2010-05-27 21:31:10 -04:00
7d6680b38a
fix hanging output throttle arithmetic
...
had multiply overflow and subtract wrap-around errors
2010-05-27 21:28:47 -04:00
8fb706716b
Prevent a null ref
2010-05-27 19:09:06 +01:00
ecc77e3886
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast. Clean this time
2010-05-27 19:09:00 +01:00
ba49319c07
Prevent a null ref
2010-05-27 20:08:48 +02:00
ac5373427f
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast. Clean this time
2010-05-27 20:08:12 +02:00
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
6b6425aa5e
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast
2010-05-27 18:44:15 +01:00
f90d81a864
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 19:26:30 +02:00
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
97501495eb
Merge branch 'master' into careminster-presence-refactor
2010-05-26 17:19:02 +01:00
a69c1c7898
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-26 10:56:37 +01:00
1c7f60ab49
Merge branch 'unitests'
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-26 10:56:24 +01:00
5d65ef2db3
Minor correction to AssetTests.cs
...
(forgot to change test descriptions, has no effect on running the tests)
2010-05-26 10:25:56 +03:00
5e719d13ef
fix sculpt normal direction for mirrored plane sculpts
2010-05-24 19:15:04 -07:00
00737f1c13
Merge branch 'master' into careminster-presence-refactor
2010-05-24 23:40:22 +01:00
7d9b316ce6
Change the way alpha is interpreted on prim text. Manris #4723
2010-05-24 23:37:47 +01:00
c7c9edd049
minor: expand upon comments about not scheduling two full updates for attachments
2010-05-24 20:11:06 +01:00
30e94cd075
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-23 12:23:16 -07:00
1ab826d67c
The 8th migration statement in AssetStore.migrations didn't look right.
2010-05-23 12:22:47 -07:00
57f4729eea
Ensured that tests are skipped for wrong conn string, also m_log chng
...
The base test class now tries to connect to DB, ignores all tests in the
class if unable to.
Also m_log changed to instance field (which in this case shouldn't cause
any problems), to avoid having to define it separately in each derived
class. Here I touched things that I don't understand well (using log4net),
so please review this commit.
2010-05-23 12:46:33 +03:00
b9b6d9c4ea
Removed (unused?) empty SQL files from MSSQL resource dir
...
There was a whole bunch of these SQL files, all empty and apparently
unused. Removing them is just a clean-up, if anybody has a reason for these
files to be there, feel free to revert.
2010-05-23 11:48:30 +03:00
05d9ca1b26
MySQL Migrations: Minor correcton to Region/Estate split
...
(some Estate SQL left behind in the Region migration)
2010-05-23 11:48:28 +03:00
52a3dbd076
MSSQL Migration: CreatorID in InventoryItems changed to VARCHAR(36)
...
Again, the same thing about potentially having non-GUID CreatorID.
2010-05-23 11:48:25 +03:00
89b7c64b6f
Various minor changes in the data tests
2010-05-23 11:48:22 +03:00
9976cb93ce
Further corrections to MS SQL stores (now passes all tests)
...
Besides, AssetData is slightly optimized to StoreAsset in one request
("IF EXISTS() UPDATE ... ELSE INSERT ...")
The main change in the MS SQL Inventory implem. is that it now return
empty list (or whatever) when called with UUID.Zero, which is consistent
with how the code for other DBs work.
I did no changes at all in XInventory, as there is no test set for them.
2010-05-23 11:48:19 +03:00
ebc2b6d4f6
Split migrations for RegionStore and EstateStore (see WARNING!)
...
ok, so the estate stores now want their own migration files, but as it
happened the SQL definition were inside the Region migrations.
It seems better/cleaner to keep each 'store' separately updatable.
WARNING: any editing in the middle of the migration scripts (as opposite
to just appending to them) has the potential of messing up updates of
existing databases. As far as I can see, this one is (probably) safe,
the worst that could happen is the EstateStore migration silently fail
if the estate the tables are already there.
2010-05-23 11:48:16 +03:00
2537acc04d
Unitests: Asset, Estate, Region (the "legacy" one), Inventory
...
The tests have been modified to work under NUnit 2.4.6
(the one currently used in the project).
They will also work with NUnit 2.5+ as is, but will look better
if you #define NUNIT25 for them.
2010-05-23 11:48:10 +03:00
330ad501a5
Added MS SQL test conn to INI - only as an example, modify before use!!!
...
NOTE that this INI file is currently loaded as a embedded RESOURCE, which is weird and has a
disadvantage of having to rebuild the Tests whenever the conn strings are changed.
The only reason is that I couldn't figure out a reliable way to put this INI into the correct
dir at runtime. If somebody can do it, that would be cool.
2010-05-23 11:48:08 +03:00
40031e6d37
Removed MySql and SQLite-specific asset test files
2010-05-23 11:48:05 +03:00
b1e6e99506
BasicAssetTest.cs replaced by AssetTests.cs
...
AssetTests: The name has changed to reflect the fact it is no longer a base class,
but the complete asset test for all supported databases.
The test can also check storing of CreatorID, but the feature is
disabled at this commit!
2010-05-23 11:48:02 +03:00
749cf0f6eb
Bugfix in tests (must clear db before migrations, not after)
2010-05-23 11:47:59 +03:00
f527584ed3
EstateData tests passing on all DBs
2010-05-23 11:47:56 +03:00
94f4c20866
Corrections in RegionTests.cs. It now fully works!
...
The problem was that some tests relied on prior tests
to leave the DB in a particular state, but the test class
cleared the DB every time. The affected tests have been
merged into one to remove the dependencies.
tested on all 3 Dbs, all tests green.
2010-05-23 11:47:54 +03:00
6322a085b3
Minor corrections in BasicDataServiceTest.cs
...
(added more functions for cleaning up DB from the
derived tests)
2010-05-23 11:47:51 +03:00
187a98615b
MSSQL: added asset_flags, CreatorID to migrations
2010-05-23 11:47:48 +03:00
49f4cc4246
MSSQLAssetData updated to support [CreatorID], [asset_flags]
2010-05-23 11:47:45 +03:00
f7bf3facff
MSSQLAssetData: fixed some weirdness
...
Fixed unfinished SQL in FetchAssetMetadataSet, fixed SQL
in UpdateAsset (must not modify ID).
NOT tested! But apparently shouldn't work worse than the previous version,
esp. the FetchMetadata thing.
2010-05-23 11:47:42 +03:00
7f70ae0ebd
All data tests made DBMS-independent
2010-05-23 11:47:39 +03:00
91ad1f4ee7
Added generic base classes for testing database services
...
These are some generic classes that simplify writing tests
for any of the data connectors and databases. Among other
things, configuring the connection strings is done once,
in a separate resource file.
Tests based on the new BasicDataServiceTest class require
NUnit 2.5 or better.
2010-05-23 11:47:36 +03:00
f84f0dbd51
Remove an unneeded conditional
2010-05-23 06:12:40 +01:00
72b96e8121
Add the SitGround flag back in
2010-05-23 06:12:11 +01:00
a9dad99432
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-05-23 06:09:54 +01:00
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
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
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
9e61e120a1
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 23:12:47 +01:00
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
6918446fcd
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 22:17:58 +01:00
d0eecf0398
Added a sanity check before using m_config in the Scene constructor
2010-05-21 14:17:03 -07:00
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
89f1ddb0a5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 21:58:55 +01:00
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
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
4b518e0288
minor: remove LongRunning test designator from TestAddSceneObject() since it isn't, really
2010-05-21 21:48:47 +01:00
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
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
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
297bcb5c3d
Merge branch 'master' into careminster-presence-refactor
2010-05-21 21:16:04 +01:00
4e23acb133
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-21 21:04:17 +01:00
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
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
682efe9463
minor: refactor CreateAsset to eliminate dupe code
2010-05-21 19:41:00 +01:00
74ef1ed36f
add prim item and test asset save in save oar unit test
2010-05-21 19:36:39 +01:00
78a0fd5281
Only send dialogs and notices to root agents, not child agents
2010-05-21 17:22:39 +01:00
c0cb66e602
Merge branch 'master' into careminster-presence-refactor
2010-05-21 15:58:34 +01:00
1d6ab445ab
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 15:31:27 +01:00
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
344f209565
Merge branch 'master' into careminster-presence-refactor
2010-05-21 06:28:13 +01:00
af5eeab7cf
Ensure that the first update sent out for any given prim is a full update
2010-05-21 07:37:55 +02:00
792e149c7e
Ensure that the first update sent out for any given prim is a full update
2010-05-21 05:13:31 +01:00
213e372253
Cleaned up MySql migrations a bit more, got rid of all old-form migration files. Restored Presence table to its taboo-breaking form.
2010-05-20 20:24:50 -07:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
d28da5e5ce
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-21 03:41:32 +01:00
b6674c9b76
Merge branch 'careminster' into careminster-presence-refactor
2010-05-21 03:03:35 +01:00
ddd072b3fb
Merge branch '0.6.9-post-fixes' into careminster
2010-05-21 02:44:20 +01:00
147c2d6f80
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 02:31:14 +01:00
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
beed74096c
Merging slimupdates2
2010-05-20 12:28:13 -07:00
56f3cb6da0
* Don't send texture data for prims in ImprovedTerseObjectUpdate packets unless we were asked to
2010-05-20 12:04:12 -07:00
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
859beaf830
Revert one of the previous patches' hunks. The new code looked better, but
...
was less efficient.
2010-05-20 11:03:38 +01:00
ce787a4c41
Series of patches to include creator ID in assets.
...
Contains a migration.
SQLite: May contain nuts.
The SQLite migration copies the entire asset table. Be prepared for quite a wait. Don't interrupt it. Back up your assets db.
BasicAssetTest checks CreatorID storage, new test for weird CreatorID
(now also checks that non-GUID or empty CreatorID gets stored correctly)
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-20 11:01:51 +01:00
5532341bf9
Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo with kitto
2010-05-19 14:04:44 -07:00
6933b48a7e
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:49:34 -07:00
f77f9ecd8f
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:44:59 -07:00
d6a6668bd7
Scrambled asset type in BasicAssetTest.cs!
...
The asset type wasn't in the list of "DontScramble" fields,
so the test assets were stored with randomized type, which
caused exception on reading them.
Also the scrambler was moved from local var to the class level,
so it could be used in the new tests I've added (see the next commit).
2010-05-19 21:50:34 +03:00
64fe823b92
MySQLAssetData.cs now supports asset_flags, CreatorID
2010-05-19 21:50:32 +03:00
eacd8d0263
MySQL: added CreatorID, moved asset_flag to migration script
2010-05-19 21:50:30 +03:00
accf8c420d
SQLite: CreatorID added (and asset_flags moved) to the migration script
2010-05-19 21:49:30 +03:00
c6977cbd4d
Added CreatorID to SQLite asset data
2010-05-19 21:49:24 +03:00
ccee95552f
A bit of harmless refactoring in SQLiteAssetData.cs
2010-05-19 21:49:22 +03:00
527a257b9f
Kind of fixed Melanie's "Exception(sql)" correction
...
Throwing an Ex. with SQL command in the message looks weird,
this is a bit better, but I'm still not sure if that's the
proper way to handle. Also, there is a catch one level up,
so is this one necessary?
2010-05-19 21:49:18 +03:00
fc76b5f589
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:24:54 -07:00
71a95900fd
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-19 00:21:38 -07:00
ba36c62caa
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:20:51 -07:00
e4b8d76b10
Change appender to deal with line feeds more intelligently.
...
Change migration error reporting to not truncate the statement when
reporting. It's a bit messier than the old error reporting, but at least
one gets an idea of what could be wrong again. And things look a lot
neater now.
2010-05-19 04:17:56 +01:00
0c209a469b
Clean up output a bit
2010-05-19 03:48:03 +01:00
20642f2f21
Fix the migration message to say "Continuing" again. Remove line feed, which
...
prevented the full message from displaying.
2010-05-19 03:26:37 +01:00
9fa8013ca5
Remove the return that was inserted in the last merge to allow
...
migrations to continue in the face of an error
2010-05-19 03:07:31 +01:00
dedc0c0bd4
Revert "Allow migration steps to fail again without bringing down the house"
...
This reverts commit 167db50259
2010-05-19 02:47:31 +01:00
167db50259
Allow migration steps to fail again without bringing down the house
2010-05-19 02:33:23 +01:00
298368dd99
Merge commit 'alex/mssql-estate-bugfix'
...
This fixes some type conversion bugs and also makes the estate lists
work properly for MSSQL. Strawberry, please check this.
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 23:39:09 +01:00
d2bc673667
Make m_log in migrations private. Define new m_log in derived class
2010-05-18 23:33:05 +01:00
caf61ab7d8
Binary Guids are 16 chars long. Fix parser.
2010-05-18 23:22:30 +01:00
deae030145
Some more corrections after MySQL connector update
2010-05-19 02:28:19 +03:00
8a0c5d14d4
All (?) MySQL stores fixed to use DBGuid.FromDB()
...
This was needed if we want to update to the latest MySQL
connector dll. It automatically converts CHAR(36) to
Guids, so getting them as strings no longer works.
By using DBGuid.FromDB(), we unlink from any particular
storage format of GUIDs, could even make them BINARY(16)
if we like.
Actually not all MySql units are touched, but the remaining ones don't
seem to be affected (they don't read GUIDs from DB)
2010-05-19 01:33:02 +03:00
a27d49b188
Added DBGuids.cs (static func DBGuid.FromDB()
...
This DBMS-independent function to be used converting UUIDs
from whatever format used in the DB (string/binary/Guid).
This is mostly needed for MySQL, as in MSSQL they are always
UNIQUEIDENTIFIERs and in SQLite always strings (but would look
better if we use it there anyway).
2010-05-19 01:32:50 +03:00
d95f232629
Massive bugfix in MSSQLEstateData (now works!)
2010-05-18 21:08:51 +03:00
e260610c00
Merge branch 'Migrations'
...
This merges AlexRa's work on migration streamlining. This merge is experimental.
If it causes issues, feel free to back out.
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 19:03:16 +01:00
55f124745f
Allow remote admin to be used on a different port from the main region port
2010-05-18 19:25:40 +02:00
3e1f2ddb8e
Allow remote admin to be used on a different port from the main region port
2010-05-18 17:01:44 +01:00
1c3790a70d
Merge branch 'master' into careminster-presence-refactor
2010-05-18 15:31:19 +01:00
df04ccfdc3
Change an exception reporting to include the stack trace. "e.Message" just
...
_won't_ do. Might look more elegant, but it's too little information.
2010-05-18 15:30:08 +01:00
bb0806c61e
Don't send kill packets to child agents as we close them
2010-05-18 03:44:09 -07:00
1c040d8c1e
Fix to the scenario where we send an agent to a neighbouring sim (via teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it.
2010-05-18 03:24:43 -07:00
ed1cfb5245
Missed a nullref in the previous commit
2010-05-18 02:33:41 -07:00
91b1d17e5b
Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
2010-05-18 01:09:47 -07:00
eb5a95d26b
Prevent an "index out of range" error on login
2010-05-18 03:02:36 +02:00
c25c40a3f9
Following on from the last commit, the stop/disconnect packet should NOT be sent when the user logs out. This eliminates the annoying "crash on log out" bug, and allows the client to commit important information at the last moment (attachment data!)
2010-05-17 15:24:28 -07:00
6bc7e3429f
Provide interface to prevent the client close function from sending the stop packet
2010-05-17 14:32:21 -07:00
8f838c722d
When killing a zombie session, don't send the stop packet since it often has the effect of killing a newly connected client.
2010-05-17 14:14:19 -07:00
a003c36de5
Merge branch 'master' into careminster-presence-refactor
2010-05-16 20:32:58 +01:00
a6023ea89e
Prevent a crash when the two agent dictionaries get out of sync
2010-05-16 20:31:02 +01:00
2fb79646c6
Fixes mantis #4691 for real. This time I tested it, and it works.
2010-05-16 10:32:57 -07:00
d8bf370fd6
Merge branch 'master' into careminster-presence-refactor
2010-05-16 17:22:38 +01:00
0b43b263d4
Fixes mantis #4691
2010-05-16 09:12:40 -07:00
b7e6b58857
Fixes mantis #4622 .
2010-05-16 09:01:27 -07:00
49f4becdae
* Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connection strings.
...
* Added a comment in LLLoginService.cs, for future reference
2010-05-16 08:10:57 -07:00
dfeb9a0b5c
MS SQL migrations converted to the new format
2010-05-16 17:04:50 +03:00
1ad12851d0
Migrations for SQLite converted to new format
2010-05-16 17:04:39 +03:00
ee713cb253
Converted MySQL migration history to the new format
...
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-16 17:04:13 +03:00
a723225179
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-16 15:02:23 +01:00
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
b49fb3db7c
Added MySqlMigrations.cs (supports stored proc/funcs)
...
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-16 16:25:08 +03:00
8b6a295874
Migration.cs supports single-file migration history format
...
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately. The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.
Status: TESTED and works fine in all modes!
2010-05-16 16:22:38 +03:00
a974146921
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-16 01:48:28 -04:00
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
ff4f50396a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-15 20:28:14 -07:00
e5e52e4072
This combination is working. It all points to not being able to use 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing.
2010-05-15 20:27:25 -07:00
019925bb2f
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-15 23:22:07 -04:00
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
74b23ff9c6
Almost, but not quite. Commenting verification again, until I understand where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets.
2010-05-15 19:58:30 -07:00
2a1e45f657
Finalized the client's TCP IP address verification process for HG1.5.
2010-05-15 19:25:14 -07:00
9dbe90801b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-15 02:20:47 -07:00
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
4b755c6d80
delete now unused MessageServerInfo
2010-05-15 02:17:10 +01:00
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
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
231cc64709
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-13 14:23:16 -07:00
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
9079ad5ceb
Add some debug output to GetAgent to try and track down our presence problems
2010-05-13 12:40:18 -07:00
4e7013d5d5
Made fields consistently protected.
2010-05-13 07:59:30 -07:00
5d8638ed88
Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is working)
2010-05-12 16:05:48 -07:00
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
fd37a21b59
Kill some locks that have crept into SOG
2010-05-12 08:34:47 -07:00
7705012ee7
Optimise the heavily used GetScenePresences; eliminate the array->list conversion on every call and transition from hard locks to ReaderWriter locks.
2010-05-12 08:25:40 -07:00
98bd3e1f34
Don't convert UUID -> ToString for every friend (Minor optimisation based on profiler feedback)
2010-05-12 07:14:06 -07:00
40e05f4109
Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)
2010-05-11 09:28:46 -07:00
14a86de115
Fix another ReaderWriterLockSlim issue
2010-05-10 12:45:33 -07:00
739b5e2c08
Fixed a typo in the Friends packaging (Pricipal -> Principal) that was making offline friendship offers fail in grids.
2010-05-10 08:01:00 -07:00
5814d16b58
Merge branch 'master' into careminster-presence-refactor
2010-05-10 15:57:32 +01:00
3cda854ef3
Fix overlooked readLock which was left open
2010-05-10 08:47:41 -07:00
ab716125d7
Correct an odd merge anomaly
2010-05-10 05:51:49 -07:00
2e94c75729
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-10 05:44:24 -07:00
2fe669448f
Greatly improve login time for users with large friends lists by requesting all unknown UUID's in one go rather than individually
2010-05-10 05:43:16 -07:00
fada4cb6c4
Merge branch 'master' into careminster-presence-refactor
2010-05-10 04:05:04 +01:00
31dc77d8a1
Return agents when angle is PI
...
Fixes Mantis #4703
2010-05-10 04:02:56 +01:00
3e8ceb3509
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-10 03:57:44 +01:00
89c762209c
Fix a null ref on region crossing
2010-05-10 03:57:17 +01:00
6f2f0fa0ca
OK, this really fixes it, I promise.
2010-05-09 14:12:59 -07:00
9cf6b81256
Yey for unit tests. The previous commit had a couple of bugs on SQL statements. Fixed here.
2010-05-09 14:02:02 -07:00
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
6a3e1734e6
Merge branch 'master' into careminster-presence-refactor
2010-05-09 18:03:57 +01:00
bc6995f921
Add Delete handler to SQLite (NG)
2010-05-09 18:02:36 +01:00
60357d3778
Implement the "delete" path for assets. Adds a new option to allow remote asset deletion in robust handler.
2010-05-09 17:56:52 +01:00
4e0d62547d
Merge branch 'master' into careminster-presence-refactor
2010-05-09 17:04:23 +01:00
9b22393cf3
Add a field asset_flags and a corresponding enum to the asset database. This
...
CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS
WITH LATER ONES. It may also eat your babies, yada, yada, yada.
The usual cautions for migrations to the assets table apply.
Coding: Can not guarantee nut free.
2010-05-09 17:02:22 +01:00
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
d72769930a
More cleaning on presence. Friends online/offline works again.
2010-05-08 07:44:07 -07:00
420dd78fb7
Merge branch 'careminster' into careminster-presence-refactor
2010-05-08 14:17:43 +01:00
14fcc2510e
Merge branch 'master' into careminster-presence-refactor
2010-05-08 13:31:36 +01:00
bfb7a49990
Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete fields.
2010-05-07 21:56:14 -07:00
15562017f2
These files are part of the GridUserService write-up.
2010-05-07 21:32:02 -07:00
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
bc7d84b75c
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-07 15:16:59 -04:00
add7abc1de
Fix Mouse+WASD makes Av rise; Fix PREJUMP.
2010-05-07 14:12:07 -04:00
eb6d63ab8e
improve handling of undersize sculpt textures
2010-05-06 23:02:24 -07:00
39c5ddc837
corrections for face numbering and uv mapping, mostly for spheres - sync with PrimMesher r56
2010-05-06 22:08:59 -07:00
5d1e9947ed
Sculpt meshing refactoring - improves mesh accuracy and UV mapping
...
Sync with PrimMesher r55
2010-05-06 21:36:27 -07:00
b309781f2d
Merge branch 'master' into careminster-presence-refactor
2010-05-07 01:00:58 +01:00
6182d71326
Also remove sale and search flags on god owner change.
2010-05-07 00:52:52 +01:00
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
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
69d0201d4c
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:38:23 +01:00
11971fb302
Merge branch 'master' into careminster-presence-refactor
2010-05-06 16:09:36 +01:00
533bd1bd9b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-06 16:08:24 +01:00
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
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
4183cef409
* Fixes LandDataSerializerTests on Windows by stripping CR from the serialization result since the reference serialization has LF only.
...
* Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
2010-05-05 21:22:29 -04:00
02dea4ce58
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-06 02:02:12 +02:00
8b4f729a21
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-05 23:58:14 +01:00
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
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
7e0d5b8665
Merge branch 'master' into careminster-presence-refactor
2010-05-05 22:50:11 +01:00
2d9a20529d
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-06 00:54:21 +02:00
733a07e061
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-06 00:34:49 +02:00
ad2039a8c4
Stab a test fail
2010-05-05 22:48:05 +01:00
e45f5ac126
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-05 22:33:22 +01:00
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
65775b87e5
Add a XMLRPC method to remotely set the login level for the LLLoginService.
...
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 23:06:36 +02:00
fe8399d1bf
Add a XMLRPC method to remotely set the login level for the LLLoginService.
...
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 20:46:53 +01:00
e0f9b1a699
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 21:12:02 +02:00
7aed89a8d0
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 18:51:01 +01:00
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
91cfce3758
back port groups changes
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
8a69070b51
back port groups changes
2010-05-05 16:09:53 +01:00
6fdd5bfe2d
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
The patch was for 0.7
This reverts commit 608bb0dfef
2010-05-05 16:03:20 +01:00
608bb0dfef
Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
...
Mantis #4646
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 14:37:05 +01:00
a9db266d93
* Added an important comment to warn people not to use MockConsole for anything but testing.
2010-05-04 22:16:07 -04:00
f005e570aa
* This should fix the tests failing because of a MainConsole.Instance null reference
...
* Added a MockConsole that doesn't require a handle to System.Console
2010-05-04 22:13:25 -04:00
efc3241541
Add perms check to the teleport home client command handlers.
2010-05-05 01:32:55 +02:00
34d882b70d
Add perms check to the teleport home client command handlers.
2010-05-04 23:15:07 +01:00
49efec2ef1
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 23:45:59 +02:00
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
07e0732a10
make the events more useful by providing the source region
2010-05-04 21:16:20 +02:00
5a4cef6b36
make the events more useful by providing the source region
2010-05-04 18:55:24 +01:00
9ca79df802
Merge branch 'careminster' into careminster-presence-refactor
2010-05-04 18:41:20 +01:00
585259ef08
Merge branch 'master' into careminster-presence-refactor
2010-05-04 18:39:04 +01:00
97bbce92a8
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 20:57:31 +02:00
1d75450743
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-04 18:37:11 +01:00
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
61ce4ca9c7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-04 09:44:56 -07:00
484584b83c
Fixed: migration #2 for SQLite. Problem was that ATTACH cannot be done inside a transaction.
2010-05-04 09:44:30 -07:00
ce86d39c70
Add "reload estate" command to sims
2010-05-04 18:31:52 +02:00
4f93d30790
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 18:10:13 +02:00
da849aea78
Allow regions to get the list of the other regions in the estate
2010-05-04 17:56:30 +02:00
9cf0077bf9
Add "reload estate" command to sims
2010-05-04 16:11:06 +01:00
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
9635af61f0
Allow regions to get the list of the other regions in the estate
2010-05-04 15:52:29 +01:00
dbce360566
Fix full circle sensors
2010-05-04 02:43:22 +02:00
c86259c671
Fix scripted give and interactive give to offline avatars. Both folder and
...
single items are now supported. Magic Boxes, yeah!
2010-05-04 00:44:05 +02:00
23d7a942ea
Refix the fix
2010-05-03 23:11:48 +01:00
92dff5edb1
Add folder version incrementing to XInventoryService. Fixes offline give
...
for avatar->avatar
2010-05-03 23:11:37 +01:00
deaa79ca9e
Refix the fix
2010-05-03 23:53:49 +02:00
80bf3934af
Add folder version incrementing to XInventoryService. Fixes offline give
...
for avatar->avatar
2010-05-03 23:47:32 +02:00
4df87631ed
Store given items in correct parent folder. Fixes items given to offline avatars
...
not getting lost.
2010-05-03 23:44:23 +02:00
f61b879f2d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 21:25:40 +01:00
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
b10811a13b
Assorted bug fixes in hypergrid linking.
2010-05-03 09:50:55 -07:00
9c8d7d34b3
Fix a bug in owner change notification
2010-05-03 04:55:41 +02:00
8766401777
Adapt CM to the new CHANGED_OWNER handling
2010-05-03 04:28:30 +02:00
1494c84f56
Fix a bug in owner change notification
2010-05-03 02:40:52 +01:00
9f8acbfe3e
Merge branch 'master' into careminster-presence-refactor
2010-05-03 01:40:24 +01:00
75063e8f60
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 01:31:32 +01:00
d6bfc490f7
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-02 20:45:01 -04:00
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
7a8ad1ceb2
Make in-place sale send CHANGED_OWNER again
2010-05-03 01:30:57 +01:00
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
175f3f992a
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-03 01:50:32 +02:00
af0ffb2a5a
Add URL_REQUEST_* script constants
2010-05-03 00:15:55 +01:00
0fa57cac3f
Fix sensor cone for sensing avatars
2010-05-03 00:54:24 +02:00
7e74291176
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-02 23:36:00 +01:00
cbb297bc79
Renamed HGInventoryBroker2 to HGInventoryBroker.
2010-05-02 10:37:57 -07:00
052580ef44
Deleted HGInventoryBroker, so that the new one can take its name.
2010-05-02 10:32:47 -07:00
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
5f6e9e6ab9
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-02 08:18:33 -04:00
7ad36d3d75
Adding DebugEvent Trap
...
Adding XMREEvent Trap
trapDebug("Modulename" ,"My data here ", scene);
trapXMRE(int data, string Message, Scene scene);
2010-05-02 08:15:12 -04:00
881fcb7def
Allow retrieval if admin users in scope mode
2010-04-30 23:32:58 +02:00
0c2ab54d41
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 21:13:31 +01:00
f1164161b3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 22:22:40 +01:00
f3662e3d15
minor: eliminate more debug Console.WriteLines, convert one to logging instead
2010-04-30 22:22:03 +01:00
d0accc0732
Allow retrieval if admin users in scope mode
2010-04-30 21:13:03 +01:00
7ae55f6248
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:29 +01:00
0a9c98e7c4
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:08 +01:00
177048a651
Fix linking issue introduced in my earlier commit
2010-04-30 20:16:21 +01:00
9bc5098dd8
Merge branch 'master' into careminster-presence-refactor
2010-04-30 20:15:19 +01:00
3e30de7430
Fix linking issue introduced in my earlier commit
2010-04-30 22:35:07 +02:00
23282935f1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 19:29:21 +01:00
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
d1fcd22173
Fix a null ref from trying to access a dictionary that was never initialized.
2010-04-30 19:28:44 +01:00
d921329799
take out some debug logging in the sqlite db adaptor
2010-04-30 18:18:21 +01:00
89e79c1133
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 17:54:00 +01:00
cc67de5b86
rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
...
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
2010-04-30 17:45:00 +01:00
486ab82c02
Fix some symbol errors
2010-04-30 12:08:37 +01:00
0ea908291d
Fix some symbol errors
2010-04-30 12:08:08 +01:00
10750421a3
Fix some symbol errors
2010-04-30 12:07:47 +01:00
9500ba2ff5
Fix some symbol errors
2010-04-30 12:06:58 +01:00
13960b3b86
Merge branch 'master' into careminster-presence-refactor
2010-04-30 11:49:24 +01:00
7dc5ebc929
Merge branch 'careminster' into careminster-presence-refactor
2010-04-30 11:49:16 +01:00
8b70477556
Merge branch '0.6.9-post-fixes' into careminster
2010-04-30 11:48:57 +01:00
04845c1898
Fix link security issue
2010-04-30 11:48:09 +01:00
4cc06ff993
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 11:47:24 +01:00
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
9c79fd6308
Treat a UserLevel of -1 as an unverified account and refer them to their
...
activation email.
2010-04-30 05:33:45 +01:00
638dc8d3c2
Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.
2010-04-29 20:09:11 -07:00
f3c21524be
Fix Av jump motion S/W
2010-04-29 19:41:08 -04:00
08ebcdb0b8
Merge branch 'master' into careminster-presence-refactor
2010-04-29 23:33:26 +01:00
f06772a088
Merge branch 'careminster' into careminster-presence-refactor
2010-04-29 23:33:20 +01:00
6a4fae123a
Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished.
2010-04-29 11:39:13 -07:00
5c23b4aa56
Fix vertical attractor
2010-04-29 13:50:11 -04:00
aba5db9ed4
Merge branch 'minor-stuff'
2010-04-28 19:38:29 +01:00
2c595227b0
Commented verbose debug messages from XInventory handler.
2010-04-28 07:41:16 -07:00
be1141f0f7
Refactoring in Migration.cs: "using()" instead of explicit Dispose()
...
This ensures that 'cmd' gets disposed on errors
2010-04-28 13:40:35 +03:00
b49e9eff56
Fixed comments in Migration.cs: wrong argument order (no change to code)
2010-04-28 13:11:42 +03:00
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
8b75302a1e
Just a bit of spellchecking in the comments
2010-04-28 12:21:39 +03:00
806a2555f5
Spelling in FriendsModule.cs: "filed to load" -> "failed to load"
2010-04-28 11:49:53 +03:00
fb7458be31
Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
...
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
423ff3b94b
Removed unused var from InventoryService.cs (-1 warning)
2010-04-28 11:47:03 +03:00
c54bc5094d
Putting it back to protected; Melanie doesn't like it to be public.
2010-04-27 18:52:15 -07:00
044c1cf5f6
Changed GetToken from protected to public. This is not exposed at the interface.
2010-04-27 18:37:34 -07:00
e838776920
* Thanks cmickeyb, for a patch that sanity checks if the response from m_Database.GetAsset(assetID) is null in AssetService.cs
2010-04-27 17:13:54 -07:00
59ac792e44
* Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
2010-04-27 17:11:24 -07:00
3f9d38538e
XInventory connector/handler showing signs of life. Tested, but needs more testing.
2010-04-27 11:01:56 -07:00
8a32ee7dd2
Merge branch 'careminster' into careminster-presence-refactor
2010-04-27 03:58:43 +01:00
89a003c6fc
Merge branch 'master' into careminster-presence-refactor
2010-04-27 03:57:36 +01:00
a92ca3c2c9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-27 03:49:25 +01:00
76e87181b2
RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet.
2010-04-26 20:28:37 -07:00
1e743eab6d
Allow a client to pass a scope id to log into in the login XML / LLSD
2010-04-27 03:48:49 +01:00
edde0be0a0
Fix build break.
2010-04-27 01:11:14 +01:00
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
06661708b4
Add a parameter to prim inventory update to prevent event firing
2010-04-27 02:40:30 +02:00
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
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
81ff5eaba0
Make scripted attachment states work. Finally. Also replace two monitor locks
...
with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
2010-04-25 22:03:35 +02:00
899d521ab4
Use the saved script states
2010-04-24 18:59:34 +02:00
27b3f23ff3
Remove some usings that stopped compilation
2010-04-24 16:53:47 +02:00
71f42f185a
Plumb a data path to initialize an attachment from an alternate source
2010-04-24 16:45:25 +02:00
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
6e99e5b47a
get region prim saving working properly in SQLiteNG
...
it wasn't working because of debug work that I'd forgotton to take out
2010-04-23 20:56:24 +01:00
f313d57fa4
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 20:11:26 +01:00
1b488c2581
dispose of the DbCommand used to execute migrations after we've finished with it rather than within the loop
...
disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
2010-04-23 20:08:24 +01:00
b5ec101cc8
add a comment about deprecating IRegionModule
2010-04-23 12:06:32 -07:00
e78f874cfd
put SQLiteNG classes in their own namespace to avoid confusion
2010-04-23 19:40:15 +01:00
56f60a04d9
Add an additional serialization call do the detach procedure. This call is
...
executed only for it's side effects, which are to block until attach(NULL_KEY)
completes, before commencing detachment.
2010-04-23 20:18:34 +02:00
fcbac43114
minor: correct the assembly information for SQLiteNG
2010-04-23 19:14:43 +01:00
5ee77886ac
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 19:05:32 +01:00
e84cc2f9db
Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll
...
Include the library so that Windows builds correctly
It appears that Windows is okay with either SQLite or SQLiteNG
Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite
2010-04-23 18:56:50 +01:00
85646b157c
Adding some more SNMP events and some refactoring
...
Signed : The Masqued Foxi
2010-04-23 12:40:27 -04:00
a23bebdc0f
Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will shortly be changed to work under mono 2.6 and above
2010-04-23 17:17:15 +01:00
31e0704c8d
Remove debug output, the culprit has been identified
2010-04-23 17:48:50 +02:00
7eda9364fd
Adding LinkUp/LinkDown when a region is started or stoped.
...
Those two events could be used to compute the region availibility
2010-04-23 10:51:27 -04:00
780630d7c0
Fix a nullref in attachment handling. Add some debug to find the attachment
...
state issue
2010-04-23 14:41:20 +02:00
8692ac53f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-22 18:56:06 -07:00
67990ea7e4
* Better error logging for failed SimianGrid web service calls
2010-04-22 18:55:31 -07:00
ebcc9874d4
Insert a ROLLBACK command on migration step failure. This ensures that
...
updating the Migrations table will not occur in a partial transaction, which
would be auto-rolled-back later.
2010-04-22 17:45:03 +01:00
e33209fe5b
Sanitized parsing of floats (x, y, z location) for Culture.
2010-04-22 08:47:47 -07:00
af778f09d5
Merge branch 'master' into careminster-presence-refactor
2010-04-21 19:51:17 +01:00
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
50f327ef5c
minor: change a comment and replace some magic numbers with the AssetType enum
2010-04-19 21:34:42 +01:00
6b963e73d9
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-19 21:28:30 +01:00
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
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
855eda844f
log problems when an asset request through the UDP TransferRequest channel goes wrong
2010-04-19 20:06:55 +01:00
de63b60748
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 19:27:45 +02:00
80024c023a
Remove the event trigger for the attach event from the attachment module.
...
The script engine already triggers this internally.
2010-04-19 18:44:21 +02:00
af3e477e4b
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 17:28:43 +01:00
d2e4f2d376
Merge branch 'master' into careminster-presence-refactor
2010-04-19 15:33:20 +01:00
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
a89208b465
Stopgap measure. Disable the recent script startup changes until I can cure the
...
race condition.
2010-04-19 14:14:31 +01:00
1667a29c88
And some more rez modes that weren't covered before
2010-04-19 12:54:33 +02:00
689b647790
And some more rez modes that weren't covered before
2010-04-19 10:54:41 +01:00
efa7873ae1
Merge branch 'master' into careminster-presence-refactor
2010-04-19 10:44:01 +01:00
b39db7e9e4
Also enable scripts rezzed into prims
2010-04-19 10:43:25 +01:00
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
f8d49e0a30
Merge branch '0.6.9-post-fixes' into careminster
2010-04-19 06:32:29 +01:00
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
72d380acf0
Merge branch 'master' into careminster-presence-refactor
2010-04-19 06:10:23 +02:00
68a4f897b4
This GetScriptErrors() change allows initial XEngine to run in background
...
thread. It should block only for the case of being called by
CapsUpdateTaskInventoryScriptAsset().
2010-04-18 19:19:16 -04:00
4e1cbd1bf3
One more bug fix in sqlite sql statements.
2010-04-16 18:04:20 -07:00
2597a3406c
Bug fix: UserAccounts in SQLite was missing the primary key constraint.
2010-04-16 17:43:15 -07:00
930d374525
Expose Delete at IUserAccountData interface. It was there already. No changes in IUserAccountService, just the data layer.
2010-04-16 16:36:44 -07:00
26e3884237
refactor: move DeatchObject() into the AttachmentsModule
2010-04-17 00:00:45 +01:00
ab3af43d5e
refactor: remove now unused internal method SendAttachEvent()
2010-04-16 23:29:36 +01:00
cac12eca79
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-16 23:24:34 +01:00
57c293d604
refactor: crudely move DetachSingleAttachmentToGround() over to the AttachmentsModule
2010-04-16 23:15:13 +01:00
b3e9dd4fc2
Bug fix in SQLite/SQLiteUserAccountData.cs: Missing'(' in one of the SQL statements.
2010-04-16 15:10:57 -07:00
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
17d023ba5b
refactor: crudely move the RezMultipleAttachments() method into the AttachmentsModule
2010-04-16 22:54:25 +01:00
e9926d13cf
minor: use the static ascii and utf8 encodings instead of instantiating our own
2010-04-16 22:38:42 +01:00
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
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
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
9131a0d4a4
minor: stop datasnapshot issuing a warning log message if it's disabled
2010-04-16 21:12:09 +01:00
48f3733963
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:43:23 +01:00
c77444a821
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:40:01 +01:00
ccc56e6dd4
Merge branch 'master' into careminster-presence-refactor
2010-04-16 05:20:25 +02:00
a7449a82bc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-14 19:49:02 -07:00
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
ff50a90a83
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-04-14 19:23:17 -07:00
407b48f3bb
The missing .csproj for the Robust 32 bit launcher
2010-04-14 19:22:48 -07:00
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
985faf4151
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-14 11:06:07 -07:00
1e87fc8a26
Applying a patch from lkalif to fix a small bug in the previous patch
2010-04-14 11:05:28 -07:00
bdc03dbff9
* Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
...
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
1636f535ba
Committing sacha's partial work (from orpheus). The GridBrat needs to learn
...
a bit of git
2010-04-14 10:42:14 +01:00
6892fc41f7
Applying patch from lkalif to add support for inventory links to the SimianGrid connectors
2010-04-13 18:59:05 -07:00
54a5b6f434
Reduce number of AvatarAnimations sent with large number of avatars
2010-04-13 18:50:08 -07:00
fac55bc78b
Change ISnmpModule to use scene references
2010-04-14 01:17:27 +01:00
4433f53f72
Drop unused Alert() method from ISnmpModule
2010-04-13 20:14:56 +01:00
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
a1c4585a39
Merge branch '0.6.9-post-fixes' into careminster
2010-04-13 04:13:26 +01:00
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
9b6e89457c
Fixed LINEAR_MOTOR Z drive, Mantis #30
2010-04-11 14:12:01 -04:00
7ecd9b3f1a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
resolved
Conflicts:
OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
2010-04-10 23:52:10 +02:00
c6ba50b7e2
Adding ColdStart event
2010-04-10 23:39:06 +02:00
0b2b2daf23
guarantee that a script engine's GetScriptErrors() will not be called
...
until after its OnRezScript() returns so that script compile error
messages can be retrieved
2010-04-10 14:43:26 -04:00
58dac970af
re-fixing this darn file
2010-04-10 18:05:08 +02:00
c4eaf195b5
dding this deleted file...
2010-04-10 17:59:08 +02:00
d975bd8e5c
Fixing Trap
2010-04-10 17:51:51 +02:00
56c176f0a3
minor - add some documentation to PrimitiveBaseShape constructor with OpenMetaverse.Primitive parameter
2010-04-09 19:59:58 -07:00
7701ea2798
Add Scene.SnmpService, which is of type ISnmpModule and, if nun-null, can
...
be used to send snmp alerts
2010-04-09 06:49:14 +01:00
54cedfe432
Changed the GetTextureModule backport to work with the 0.6.9 codebase
2010-04-08 15:57:57 -07:00
c4c4c3696e
Backported WebUtil.cs from master to 0.6.9-postfixes to fix the build break
2010-04-08 15:26:51 -07:00
0f3314c04c
Backported GetTextureModule and IAssetService.GetCached()
2010-04-08 15:00:01 -07:00
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
d834a2c3da
Implement cmGetAvatarList(). This returns a strided list of all avatars in the region, including their UUID, position and name. The radar is often the most taxing scripts on a sim, this function can help radars reduce their impact by 66% by eliminating the need for sensors.
2010-04-07 23:53:08 +02:00
e80e04c5fd
Increase the amount of time we wait for a teleport to complete. This allows teleportation to a remote region without a local connection to the asset server without timing out.
2010-04-07 22:59:13 +02:00
542abb9c43
* Fixing incorrect documentation for the continuation passing style IAssetService.Get() method
...
* Changing the SimianGrid asset service connector to match the corrected documentation
2010-04-07 09:58:16 -07:00
309f440fc0
Fix llDialog responses so that they can be heard throughout the region. This now conforms to the behaviour in SL. ( http://bugs.meta7.com/view.php?id=13 )
2010-04-07 10:13:47 +02:00
db5ea850f6
Fix llLookAt so that it doesn't "roll" the object and more closely imitates the behaviour in SL. ( http://bugs.meta7.com/view.php?id=28 )
2010-04-07 09:49:11 +02:00
20e3de1f0a
Add CHANGED_REGION_START (alias for CHANGED_REGION_RESTART as per LL Jira SVC-3773)
2010-04-07 08:28:57 +02:00
335c1b4420
Implement PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE
2010-04-07 07:48:26 +02:00
5fc9fe70af
Added NullInventoryData for unit tests and quick try-outs of the services in 64-bit machines (no SQLite).
2010-04-06 19:38:01 -07:00
a97a887ea4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 23:25:46 -04:00
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
f302224caf
* In the async asset fetch method, cache check before firing any async code. This should alleviate some "thread storm" issues when regions are starting up that hit Mono especially hard
2010-04-05 14:52:25 -07:00
e40acda6c8
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 23:22:14 +02:00
e7be131b89
Add the ISnmpModule interface definition to Careminster release
2010-04-05 23:20:56 +02:00
fd4a059e9b
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-04-05 23:17:31 +02:00
2f454843d8
Fix up my own shoddy code! Fixes prim rez break. Whups!
2010-04-05 23:17:06 +02:00
a573b5767b
Test commit
2010-04-05 22:31:30 +02:00
5c04d768a6
Bump version number
2010-04-05 22:26:18 +02:00
4bf1598930
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 16:15:23 -04:00
07b4889eab
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-04-05 22:11:11 +02:00
7a3bb266eb
This commit adds some randomness to object persistence. It's a Work In Progress, I am working on improving this to a tiered approach.
2010-04-05 22:11:05 +02:00
f34cc6b469
Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so it can be reverted then.
2010-04-05 22:08:34 +02:00
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
9b9e2a8c71
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 15:27:13 -04:00
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
2fbbc13c71
Fix some overlooked merge conflicts that got committed
2010-04-05 19:42:15 +01:00
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
35bf75a77a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 14:08:57 -04:00
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
fe034dc3e4
Merge branch 'master' into careminster-presence-refactor
2010-04-05 18:12:29 +01:00
f505c1d0a4
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-04-05 18:10:49 +01:00
04a68db195
Merge branch '0.6.9-post-fixes' into careminster
2010-04-05 18:10:36 +01:00
e2a521742a
ChODE Only: Corrected Heightmap load to iliminate crack at 255M. Added 'fence' option to prevent physical objects crossing region border.
2010-04-04 22:57:32 -04:00
956225f0e1
Fixed Ban and parcel exclusion. Need to fix the parcel chat too
2010-04-04 18:29:18 +02:00
dc58c985e8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-04 02:24:52 +01:00
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
e6ed9b6747
* Guard against null in last commit
2010-04-03 18:12:03 -07:00
cfa941adc7
Last commit was too fast... must override.
2010-04-03 12:14:57 -07:00
8f68edfe12
* Fail storing user accounts in the remote connector.
2010-04-03 12:11:54 -07:00
6485c576a1
* Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
...
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -07:00
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
a895de4414
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-02 13:32:40 -07:00
4c9cc56624
* Better logging for Authenticate() failures
...
* Changed a warning message to debug when fetching user sessions
2010-04-02 13:32:30 -07:00
a004d88bf3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-02 14:53:52 +01:00
4b98d0db92
Adding the groups update (Mantis #4646 )
...
Thanks, mcortez.
2010-04-02 14:53:33 +01:00
e0eba26f7b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-01 23:59:00 +01:00
938905df1e
oops, add file missing from last commit
...
refactor out redundant method from GroupsMessagingModule
2010-04-01 22:45:01 +01:00
c33b1de9df
expose methods that allow region modules to send messages to groups
2010-04-01 22:37:20 +01:00
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
2bf1761ad8
When saving an oar/iar, don't attempt to write out the data byte array if it's empty
...
On Mono 2.6 (and probably before) this causes a non-obvious IOException
2010-03-31 19:51:17 +01:00
21519d3311
Add missing licenses. Change relicensed LightShare module to proper BSD
...
licensing.
2010-03-31 13:33:18 +01:00
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
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
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
7d917e7c5c
Rename Meta7Windlight to LightShare
2010-03-30 23:29:03 +01:00
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
8cb81bdc9b
minor: commented out code removal
2010-03-30 17:06:30 +01:00
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
24fc4703d0
fix build break. First argument of GetGroupRecord is not a uuid
2010-03-29 22:02:02 +01:00
e7e56e0143
Remove a redundant method body
2010-03-29 19:50:24 +01:00
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
efc0916a01
May fix mantis #4613
2010-03-27 22:48:15 -07:00
1430441cf3
Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion
2010-03-26 15:13:55 -07:00
d6a64bf732
* Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This won't fix the bug I'm seeing with regions not realizing they are already part of an estate, but it will fix the OpenSim crash if that situation ever comes up
2010-03-26 13:50:25 -07:00
c6bbb48f2b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-03-26 13:14:32 -07:00
8ee0bdb86e
Minor improvement on debug message.
2010-03-26 13:13:33 -07:00
9fb17e7ab2
Select Random Region if Home or Last cant be found
2010-03-26 13:06:26 -07:00
05123c6bd5
* Fixed a dictionary value retrieval in GroupsModule
2010-03-26 12:39:22 -07:00
3e8cb7a9a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-26 12:21:24 -07:00
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
dd544f811a
switch flavor to RC1
2010-03-26 19:09:09 +00:00
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
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
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
857918d3b0
minor: some debugging information and spacing changes to group module
2010-03-25 23:53:05 +00:00
f0703cad2c
add get group by name method to IGroupsModule
2010-03-25 22:47:52 +00:00
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
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
6ad85dc259
put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
...
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
e0b287961f
Change land overlay to send group owned status properly
2010-03-23 17:04:37 +01:00
3fb73e4e26
UNTESTED SQLite code to enable estate setup in interactive confguration
2010-03-23 02:18:55 +00:00
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
07a6b37001
Somehow the starting estate number in MySQL was lost. This adds a migration
...
to start estates at 100. Existing databases having autcreated estates below
100 will see a gap in estate numbering. Other database implementors need to
ensure that no estates with numbers less that 100 are autocreated, unless
they are prepared to deal with the viewer's built-in notions of
Linden Mainland
2010-03-22 20:38:27 +00:00
d378c758e1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-22 18:51:07 +00:00
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
9a781e793a
* Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
...
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
2010-03-20 19:21:58 -07:00
f020bd3206
Fix a nullref in permissions when returning objects via right-click
2010-03-20 15:49:39 +00:00
0f5fb6f190
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-03-19 19:14:09 -04:00
add47befac
Update acceleration to 0 on no tphysical.
2010-03-19 18:53:16 -04:00
5e65bef805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-19 15:17:15 -07:00
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
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
0e36994fe7
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-03-19 13:27:12 -04:00
3ea72eeabb
Fix sit with autopilot.
2010-03-19 13:26:34 -04:00
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
46d990419b
Merge branch 'careminster' into careminster-presence-refactor
2010-03-18 20:00:58 +00:00
e0289bb432
Flesh out the new permission method
2010-03-18 19:58:21 +00:00
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
1a2cbbc8c1
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-18 18:58:44 +00:00
f35eb8819c
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:37 +00:00
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
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
6df969894c
Fix AbsolutePosition for autopilot/sit.
2010-03-17 13:30:48 -04:00
e442c2a3f9
Prevent llTeleportAgentHome from affecting gods
2010-03-17 17:42:33 +01:00
a647f50087
minor logging changes to BaseHttpServer, OSHttpRequest
2010-03-16 22:58:12 +00:00
b51f40da8f
Removed the unused use_async_when_possible config variable
2010-03-16 12:03:04 -07:00
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
d722519b31
* Fixing the SimianGrid friend connector enabled detection since the friends module uses a different pattern in the .ini file
2010-03-16 10:40:15 -07:00
37815f3402
Debugger tags for VS2010
2010-03-16 18:13:00 +01:00
3be2b592b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-15 20:54:57 -07:00
65c1fbc14d
Fixing line endings
2010-03-15 20:54:48 -07:00
cffe39b95f
* Fixed a bug in Simian.IsSimianEnabled (since the default module strings follow the form OpenSim.Services.Connectors.dll:SimianGridServiceConnector instead of SimianGridServiceConnector)
2010-03-15 20:52:41 -07:00
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
76106e39d9
Restoring LoadPlugin as it was before. Justin's last change made it throw.
2010-03-15 19:34:14 -07:00
4e180e84e2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-15 15:38:55 -07:00
84459d2bc2
Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors
2010-03-15 15:38:29 -07:00
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
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
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
898fa637c3
Merge branch 'careminster' into careminster-presence-refactor
2010-03-15 17:12:08 +00:00
8cbd0d3b5f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-03-14 16:23:12 -04:00
8198062610
RotLookAt repaired; debug msg cleanup.
2010-03-14 16:22:13 -04:00
1e73e16fd0
flip UVs for profile faces
2010-03-13 18:41:36 -08:00
2ebc4be99d
add a null check in ScenePresence constructor
2010-03-13 12:04:49 -08:00
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
41a98b902b
correct some references which could produce erroneous prim face numbers
2010-03-12 22:05:22 -08:00
1d14cf8c3f
some improvements to sculptmap alpha handling and LOD
2010-03-12 21:21:28 -08:00
4b81393274
minor: remove some mono compiler warnings
2010-03-12 23:21:45 +00:00
315fa06c75
refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule
2010-03-12 23:20:38 +00:00
6828d8ecbe
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 22:49:16 +00:00
582375509c
refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule
2010-03-12 22:48:49 +00:00
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
1379ae4310
Fix Rotation Lock. NOTE: This version had poor border crossing control
2010-03-12 16:13:52 -05: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
7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05: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
f6f6ef1532
Dynamics Integration Part 1
2010-03-11 19:12:38 -05: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
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
689514a40a
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:12:10 +00:00
88771aeed3
Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
...
to use that stored value.
2010-03-09 23:11:28 +00:00
40873504dc
Merge branch 'master' into careminster-presence-refactor
2010-03-09 22:46:17 +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
fce9e499e4
- parcel blocking, region crossing blocking, teleport blocking
2010-03-09 22:38:58 +00:00
80b5a95bb8
Revert "Adds Land Banning."
...
This reverts commit a87d7a1296
2010-03-09 22:29:02 +00:00
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
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
5caae0293a
Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
...
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
Backport from head.
2010-03-09 18:53:04 +00: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
49baf090cd
Small consistency change
2010-03-07 16:08:00 +00:00
c8c608acc8
Small consistency change
2010-03-07 16:07:40 +00:00
3d053b194a
Small consistency change
2010-03-07 16:06:52 +00: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
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
2fdd535302
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-06 12:24:26 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
83929c69e3
- implementing server 1.38 functions
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:59:16 +00: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
395f343498
refactor: Move DetachSingleAttachmentToInv to region module
...
need to rationalize method names later
2010-03-06 00:07:47 +00:00
e7422fe9b2
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-05 23:37:49 +00:00
71797af540
refactor: move another AttachObject method
2010-03-05 23:35:49 +00:00
b72c2dc6e8
refactor: move user inventory side of RezSingleAttachment to module
2010-03-05 23:29:24 +00:00
60553e62a3
refactor: begin to move attachments code into a region module
2010-03-05 23:18:47 +00:00
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
463d775261
Bug fix on user account creation -- ServiceURLs field now properly filled out.
2010-03-04 21:02:35 -08:00
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
8bd114b4df
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-05 00:27:24 +00:00
82cccdeb94
minor: comment out a forgotton debug log line
2010-03-04 22:50:02 +00:00
a1643c78be
remove test presence from NullPresenceData since this appears to stop existing sessions with home locations from being picked up
...
only tested for a single user so this may still fail for multiple users
this may well be all academic anyway since standalone need to persistently store home location in presence data in some way
2010-03-04 22:43:30 +00:00
87590491b5
Fix Physics angular reference frame.
2010-03-04 16:33:26 -05:00
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
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
62dd83f473
Remove a superfluous array creation
2010-03-04 10:47:16 +00:00
84b0a23e19
Remove a superfluous array creation
2010-03-04 10:45:46 +00:00
31f7e06c25
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-04 10:43:12 +00:00
5d2f854288
Remove a superfluous array creation
2010-03-04 10:38:03 +00:00
716e6f20e1
compiler warnings revealed that public PlaySoundSlavePrims properties were changing the wrong protected fields.
...
correcting these may resolve the sound problems seen recently on the mailing list, though not guaranteed.
2010-03-03 23:40:32 +00:00
c4ba2e5dfb
minor: remove some compiler warnings
2010-03-03 23:35:23 +00:00
8305e6af07
refactor: push sog.SendPartFullUpdate() down into sop where it better belongs
...
no functional changes
2010-03-03 23:29:09 +00:00
60fde0c83a
minor: remove a couple of compiler warnings
2010-03-03 23:03:41 +00:00
a0b22a9adc
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-03 22:48:41 +00:00
61a63ff851
* Added three new helper utility files to OpenSim.Framework. MultipartForm is used for constructing multipart/form-data requests. UntrustedWebRequest places sanity checks and policy on requests to HTTP endpoints that are not in the same trust domain (useful for Hypergrid, OpenID, etc). WebUtil contains misc. functions for managing URLs and network streams
2010-03-03 14:38:00 -08:00
edb176447b
Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
...
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
2010-03-03 22:14:06 +00:00
fc233d4e1e
* Adjusted the significant movement magic value from 0.5m to 2.0m and added an explanation of what it does
2010-03-03 12:34:21 -08:00
13a8d11c46
Removing the sLLVector3 dinosaur
2010-03-03 12:12:32 -08:00
94a3e60bd0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-03 11:03:56 -08:00
a6e23a3275
* Fixed bad start position clamping in MakeRootAgent()
2010-03-03 10:59:05 -08:00
660ebe52cf
Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing!
2010-03-03 18:40:33 +00:00
296c68a9de
Make the service loader pump out the error to the log (in red) and include the dll/interface/args that caused the problem
...
This gives people more of a fighting chance of finding out what went wrong
2010-03-03 18:28:30 +00:00
1c68ad2bba
remove references to OpenSim.Framework.Commuications.Tests.dll since all relevant test code has been obsoleted
...
this allows the tests to pass on my local system
2010-03-03 17:50:05 +00:00
aee887afaf
Added empty service URLs upon account creation.
2010-03-03 09:16:21 -08:00
9fda5c51ac
More debug.
2010-03-02 22:20:44 -08:00
d167686adb
Better error handling on PasswordAuthenticationService
2010-03-02 21:12:53 -08:00
13f0e4a718
* Better debug message on login problems.
...
* Moved GridInfoService config to OpenSim.Server.ini
2010-03-02 20:17:25 -08:00
7ec1a3fcad
Merge branch 'master' into careminster-presence-refactor
2010-03-03 03:18:19 +00:00
028a87fe37
Merge branch 'master' into careminster-presence-refactor
...
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
14073831d2
Fixes Region.Framework tests. Although these tests don't fail, they need to be rewritten, because they are doing agent manipulations in the wrong way, so they're fairly meaningless.
2010-03-02 07:53:52 -08:00
763285aaf1
Fixed SQL tests.
2010-03-02 07:29:41 -08:00
cb6c371a85
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-03-01 22:23:52 -08:00
00e6739b7d
Offline friendship offers now working.
2010-03-01 22:21:33 -08:00
53a8286468
Changed the query in GetFriends in SQLite to match the one in MySql.
2010-03-01 21:35:46 -08:00
c6a5ff26ff
Friends rights under control.
2010-03-01 21:32:55 -08:00
581056eaf3
Merge branch 'master' into presence-refactor
2010-03-02 04:43:36 +00:00
cfaf087b89
More work on GrantRights. Still not right.
2010-03-01 09:23:33 -08:00
780ee4f991
Fix a few compiler warnings.
2010-03-01 23:04:45 +09:00
b8d89ac6da
Fix -1 checks for login case
2010-03-01 02:57:25 +00:00
dc22e74033
Small tweak
2010-03-01 02:54:18 +00:00
38ea1dd5c8
Merge branch 'master' into presence-refactor
2010-03-01 01:01:32 +00:00
65fadd2f67
Should have things the right way around, better that way
2010-03-01 00:20:34 +00:00
bfcc57c071
Change friends to handle offers as it was originally designed. This may
...
need to be changed in SQLite & MSSQL as well
2010-03-01 00:02:14 +00:00
18727235a0
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
2010-02-28 23:26:38 +00:00
774958bbbf
Added FriendsData to both Null storage and SQLite. Untested.
2010-02-28 16:09:06 -08:00
adb9cc2af9
Implement rights changes locall (UNTESTED)
2010-02-28 23:26:13 +00:00
86c621fdc7
Change the signature of SendChangeUserRights, because we have to send
...
this to both parties
2010-02-28 22:56:31 +00:00
44e7224b86
Add missing ChangeUserRights packet sender
2010-02-28 22:47:31 +00:00
5c5966545d
Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there.
2010-02-28 12:07:38 -08:00
db24e57cab
Friends connectors finished. Status notification working across the board. One last bug: friends online upon login are not being sent to the user.
2010-02-28 08:36:13 -08:00
1daabc3473
Status notification (online/offline) working for same sim.
2010-02-27 18:16:31 -08:00
593fd54fc7
Update the local cache upon friendship acceptance. Logout notifications working.
2010-02-27 11:23:31 -08:00
a234672db8
* Finished implementation of FriendsService.Delete
...
* Deny now working
2010-02-27 10:57:57 -08:00
3906a14857
Friends online notifications upon friendship now working (same sim only).
2010-02-27 10:24:55 -08:00
a4472ceeac
Implement the requestonlinenotification method
2010-02-27 15:50:41 +00:00
0ab65899e4
Move requestonlinenotification generic message to presence module
2010-02-27 15:37:00 +00:00
6f770af5fb
Implement a handler for requestonlinenotification generic message
2010-02-27 15:25:51 +00:00
de5c2801e8
Friendships established.
2010-02-27 08:14:37 -08:00
25870e8049
* Friendship offers starting to work in the same sim. Not quite right yet.
...
* Added skeleton for out Connectors/Friends/FriendsSimConnector.cs
* Moved request handler to its own file
2010-02-26 20:35:45 -08:00
dc88dc2c3d
More flesh to FriendsModule. Still incomplete.
2010-02-26 17:33:08 -08:00
dfc17a531f
Add the client message handlers. The calling card handlers that are part of
...
the old friends module are omitted intentionally, as I believe those should
be in a calling card module, not bundled with friends.
2010-02-26 21:37:07 +00:00
2c6606cee4
Removed unnecessary debug message
2010-02-26 10:46:13 -08:00
bbb43f9bde
Now showing friends online upon grid login.
2010-02-26 10:35:23 -08:00
93967d4a1c
fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database
...
this meant that the loaded settings would disappear after a restart
2010-02-26 18:30:05 +00:00
2af7577fab
Flags on Store(Friend) are supposed to be MyFlags.
2010-02-26 09:01:59 -08:00
cc05bdf6ab
* Friends out connector completed. Grid login retrieves friends correctly.
...
* Added friends configs to grid .inis
2010-02-26 08:46:30 -08:00
c745df007d
Added server-side Friends in connector. Untested.
2010-02-25 17:42:51 -08:00
12432b1751
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
2010-02-25 23:34:58 +00:00
ba38b3b2df
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-02-25 16:11:28 -08:00
679ad95750
List of friends now retrieved upon login. Configured and tested in standalone only.
2010-02-25 16:11:04 -08:00
1a3ad3ae80
Implement local online/offline notifications
2010-02-25 23:32:38 +00:00
161d16405d
Check flags on initial login
2010-02-25 23:04:05 +00:00
393a782858
Fix the crashed session notification from the userserver.
2010-02-25 18:05:30 +01:00
7f61de8f57
Allow particles and texture anims to be persisted to XML. This behaviour is expected.
2010-02-25 14:14:53 +01:00
e99341d7df
llDie() should not work on attachments (results in an incosistent attachment state)
2010-02-25 12:07:56 +01:00
efd4810851
Disable blocking teleports within the same parcel for now; it's not implemented correctly. Will review soon.
2010-02-25 12:04:51 +01:00
44d5b2910f
Implement initial online notifications
2010-02-25 04:22:51 +00:00
f2b36f8e76
Implement friend perms
2010-02-25 04:02:03 +00:00
b97f3860cb
Begin tracking users and friends
2010-02-25 03:55:21 +00:00
e776bf9316
Grab the presence module and load the friends connector into the friends module
2010-02-25 03:07:46 +00:00
c7b1e76eb5
Add the stream handler/listener and requisite methods to the friends module
...
for the friends interregion comms.
2010-02-25 01:46:34 +00:00
92029dc171
Remove some obsolete files from MSSQL. Fix a missing constructor arg that
...
was introdiced by the latest jhurlipatch
2010-02-24 16:00:06 +00:00
2fa5694ec9
MSSQL Additions for Presence Refactor branch. Most functionality tested and works, some outstanding issues around login location and border crossings on y axis.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-24 15:50:44 +00:00
267f3b8147
Fixed typo that was affecting the BasicInventoryAccessModule
2010-02-24 08:03:30 -08:00
4aa37e995d
Remove the overlooked remnants of core profile support
2010-02-24 06:28:16 +00:00
c6dd670d58
Streamlined error logging for malformed packets and fixed a bug when printing the hex dump
2010-02-23 14:58:36 -08:00
d506449f67
* Removed the unused GridRegion.getInternalEndPointPort() (just use InternalEndPoint.Port). This class is complex enough as it is
...
* Changed the failed to inform neighbor message from a warning to info, since this will fire for every empty neighbor space
* Made the EnableSimulator/EstablishAgentCommunication log message more verbose and more clear about what is happening
2010-02-23 00:59:24 -08:00
3437605da6
* Removed the broken and unused GridRegion.ExternalEndPoint setter
2010-02-22 16:13:14 -08:00
df76e95aa2
Changed asset CreatorID to a string
2010-02-22 14:18:59 -08:00
71c6559a91
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
2010-02-22 14:10:19 -08:00
7665aad002
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
2010-02-22 13:27:17 -08:00
e635570cf3
minor formatting tweak - try to trigger a build on panda
2010-02-22 02:13:01 -08:00
03706e3f08
add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive
2010-02-22 01:15:12 -08:00
300f4c58a6
Separate PhysX classes into separate files.
2010-02-22 13:16:40 +09:00
2dea162073
Formatting cleanup.
2010-02-22 12:25:59 +09:00
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
2e7aa387f7
One more test running.
2010-02-21 19:11:48 -08:00
70de6956ff
Small bug fixes for making tests work.
2010-02-21 18:56:44 -08:00
b92645ac56
MySQL tests pass, except T016_RandomSogWithSceneParts. Total mystery as to why that test doesn't show in panda.
2010-02-21 17:59:00 -08:00
bb171717ce
Deleted obsolete files in the Data layer. Compiles.
2010-02-21 15:38:52 -08:00
bd5a4dab0c
Bug fixes on field names in order to make data import work from old users table to new UserAccounts table.
2010-02-21 09:39:12 -08:00
552e9e8c78
* Added SQlite connector for AvatarData. Tested -- works.
...
* Small bug fix in debug message
* Set default standalone configs to use SQLite across the board
2010-02-21 09:09:35 -08:00
8a4947f8c7
SQLite connector for UserAccounts and Auth works. Yey!
2010-02-21 08:47:24 -08:00
56fb7821ad
Restored mising m_Connection.
2010-02-20 21:24:18 -08:00
d761d1624b
Fix SQLite locking and make it more fascist for now
2010-02-21 04:20:22 +00:00
611eeb583c
Reverted SQLite/SQLiteGenericTableHandler to what it was + singleton.
2010-02-20 20:59:04 -08:00
df59d098b3
SQLite connector better, but access to tables still doesn't work.
2010-02-20 20:13:38 -08:00
0ab6aac052
Added UserAccountData and auth to the SQLite connector. Compiles, runs, but access to these tables doesn't work.
2010-02-20 17:52:38 -08:00
845a390e93
* Added a sanity check for missing asset data in LLClientView
...
* Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil
* Linked content type to asset type in AssetMetadata
2010-02-20 16:21:13 -08:00
d1f2fae348
Formatting cleanup.
2010-02-20 11:02:06 +09:00
eb22fde96c
* Fixed SL asset type enum to mime type conversion and added more helper functions for going back and forth between enums and mime types
2010-02-19 15:28:35 -08:00
68b494b2cc
Apply http://opensimulator.org/mantis/view.php?id=4495
...
Adds IsChildAgent property to IAvatar in MRM.
Thanks ziah
2010-02-19 22:44:33 +00:00
8294fbd069
minor: remove mono compiler warning
2010-02-19 22:31:53 +00:00
c767a7901c
forestall bug reports about the Command error: System.EntryPointNotFoundException: CreateZStream save/load oar/iar issue by telling the user what the likely problem is
2010-02-19 22:30:46 +00:00
214b1351fb
minor: Make FlotsamAssetCache default loglevel 0 to match that given in bin/config-include/FlotsamCache.ini.example
2010-02-19 21:18:03 +00:00
842b68eeff
Change handling of the SYSTEMIP constant to be more sane.
...
This will now choose the first network interface IP address, or the loopback
interface if no external interfaces are found. It will log the IP address
used as [NETWORK]: Using x.x.x.x for SYSTEMIP.
2010-02-18 04:19:33 +00:00
92f8f3e9d2
Revert "change "SYSTEMIP" to "localhost" in the create region console command prompt" after speaking to Dahlia
...
This reverts commit c62a6adb2b
2010-02-18 03:31:06 +00:00
c62a6adb2b
change "SYSTEMIP" to "localhost" in the create region console command prompt
2010-02-17 19:56:30 -08:00
10f94a3c33
remove old commented out switch statement in LLClientView since this has successfully been split into separate methods for quite some time now
2010-02-17 21:13:31 +00:00
95a31c9b6f
minor: fix error inserting field in log message
2010-02-17 20:57:29 +00:00
92a8d7ce6c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-16 23:15:59 +00:00
d6eff8ebcf
Change a condition to actually make linden land reclaim work
2010-02-16 23:14:57 +00:00
4355bcc417
Disable Data.BasicRegioNTest.T016_RandomSogWithSceneParts() temporarily since it's making the tests fail but the cause is not obvious (wrapped up in layers of reflection)
2010-02-16 19:31:49 +00:00
4c90ee2943
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-16 19:08:06 +00:00
052f2b3e27
minor: Make SOG.DelinkFromGroup() return the newly delinked scene object instead of void
2010-02-16 14:36:08 +00:00
af2d20c5fa
Fix an inconsistency in llSetPayPrice between SL and OS behaviour
2010-02-15 22:22:36 +01:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
47a9e48f46
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-02-15 06:15:14 +01:00
94c417c90c
Implement missing llGetPrimitiveParams parameters
2010-02-15 06:10:04 +01:00
5c7acd0d4d
Fixes a bug in the previous patch.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-15 01:07:02 +00:00
c033223c63
Merge branch 'master' into presence-refactor
2010-02-15 00:20:48 +00:00
d326a1df3f
Extraneous debug messages removed
2010-02-14 17:01:22 -08:00
dc19785672
Added UserAccount, Avatar and Authentication to Data.Null, so that OpenSim can run out-of-the-box. #WaitingForSQLite
2010-02-14 16:57:02 -08:00
ce3e265575
Plug a small hole
2010-02-15 00:06:03 +00:00
2c0c21d0a5
Plug a small hole
2010-02-14 23:58:54 +00:00
b2fefe3e3f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-14 22:27:59 +00:00
2084e08ad7
Merge branch 'master' into careminster
2010-02-14 22:27:39 +00:00
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
45493171b0
* SQLite match code casing with regionsettings table field casing (what's with the upper case S in Sandbox while the rest is lower case 0.o)
...
* It's doubtful that this will have any effect on mantis http://opensimulator.org/mantis/view.php?id=4577 . Sqlite 3 is required, Sqlite 2 was reported.
2010-02-13 05:50:57 -05:00
fa6da2f6c6
* This is an attempt to resolve mantis 4437 by using SqliteAdapter type statements instead of blanket SQL statements. The hope is that this makes SQLite work on Linux/Mono again. Re: http://opensimulator.org/mantis/view.php?id=4437
...
* Added a 'Create Update Statement' method that takes two fields for a primary key
* Added an Update and Delete command for parcels and land access list table rows.
2010-02-13 05:09:15 -05:00
00800c59d3
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
...
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
aad95fcff5
minor: remove completely commented out and unused class
2010-02-12 22:45:59 +00:00
802a969267
Fix http://opensimulator.org/mantis/view.php?id=4224
...
This resolves the problem where eyes and hair would turn white on standalone configurations
When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it.
This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white.
This bug did not affect grids since they use a different service connector.
2010-02-12 21:32:03 +00:00
9568718add
Angular motor adjustments
2010-02-12 15:56:21 -05:00
6a70349512
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-12 14:08:32 -05:00
1948378538
Implement the methods needed for the login service to populate the friendslist
...
on the friends service
2010-02-09 17:08:36 +00:00
1dfcf68330
Add the friends service skel and correct some namespace issues
2010-02-09 07:05:38 +00:00
61c8bbb4f0
Add license header and change branded namespace to generic
2010-02-08 22:52:01 +00:00
35925942fc
Deleted unused class that came back because of merge conflicts.
2010-02-08 15:02:50 -08:00
6dcc4ab466
Add license header and change branded namespace to generic
2010-02-08 22:50:59 +00:00
0ad8046582
Resolve a merge issue
2010-02-08 22:44:17 +00:00
ad38450f9c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-02-08 22:43:53 +00:00
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
1d75ad9fd5
Merge branch 'master' into presence-refactor
2010-02-08 21:54:26 +00:00
def8f8166a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-08 21:42:23 +00:00
5ddd995de8
Bug fix in configger
2010-02-08 21:42:12 +00:00
aba5908860
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-08 21:39:46 +00:00
ef8b2d2f90
Convert null presence data to a singleton as well. Standalone logins now work
2010-02-08 21:38:49 +00:00
d8bab61af4
Convert NullRegionData to a singleton pattern, since that is required
...
for a standalone
2010-02-08 21:24:04 +00:00
ad28db3669
add some method doc to IDynamicTextureManager
2010-02-08 21:21:21 +00:00
59851ceee6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-08 14:29:06 -05:00
9f4883d146
refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in Scene.AddSceneObject since this wraps a check that is much less clear
2010-02-08 19:10:54 +00:00
00947cf2ca
Add EventManager.OnIncomingSceneObject event which is triggered by an incoming scene object
...
Add a read-only Attachments property to ScenePresence
2010-02-08 19:02:20 +00:00
65a9bcee70
Create root inventory folder with proper type (9) instead of -1
2010-02-08 17:46:54 +00:00
210649f0d4
Make an exception report more clear. Fix a database access in Presence to
...
conform to the changes in the generic table handler.
2010-02-08 17:38:05 +00:00
b8346e87d8
Bug fix in configger
2010-02-08 16:12:20 +00:00
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
70a0d7aa46
Adding the Careminster "Configger" tool to OpenSim. The tool will, when launched
...
in place of OpenSim, dump the config to stdout. Use -f xml, -f ini or -f mysql
to get a condensed ini file, an xml file suitable for webloading, or a set
of mysql insert statements.
2010-02-08 15:21:35 +00:00
16f77fa1f1
Finished implementing the XInventory connector. Untested.
2010-02-07 16:41:41 -08:00
2ad2561ed1
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
2010-02-07 12:06:21 +00:00
c6adbccc27
Finish the "Get friends" method
2010-02-07 12:06:00 +00:00
29e501d688
A little more beef on the xinventory in connector.
2010-02-06 19:06:08 -08:00
5dc278b0d7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into mysql-performance
2010-02-06 01:05:58 -08:00
fabf10f1cf
endline fix 2
2010-02-06 00:38:22 -05:00
59f6606ecf
Endline fix
2010-02-06 00:37:07 -05:00
e1b5c61247
Updated MySQL connection management to use the MySQL connection pooling. This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way.
2010-02-05 18:07:59 -08:00
5f1f5c29e9
Fixing an incorrect logging message in insertUserRow
2010-02-05 18:06:01 -08:00
3e697ad57e
* Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null
2010-02-05 18:05:57 -08:00
e251f42443
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
2010-02-05 17:46:37 -08:00
310e14cf03
Fixing an incorrect logging message in insertUserRow
2010-02-05 17:45:36 -08:00
e982397cde
* Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null
2010-02-05 17:45:31 -08:00
4a092b5ab8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-06 01:13:01 +00:00
6392cfcd61
Fixing an incorrect logging message in insertUserRow
2010-02-06 01:12:45 +00:00
97eaae9d84
* Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null
2010-02-06 01:12:36 +00:00
bf9fc69d01
minor: log what kind of wearable cannot be found
2010-02-05 19:34:25 +00:00
68bb2dac45
Revert "Old OpenSim installations may have no AssetCaching setting in config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)"
...
This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules)
This reverts commit 7058a4c259
2010-02-05 19:21:27 +00:00
7058a4c259
Old OpenSim installations may have no AssetCaching setting in config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)
...
If this is the case, this patch makes CenomeAssetCache the default cache (which matches that selected in StandaloneCommon.ini.example)
Not having an asset cache may lead to a continual loop of appearance baking failures and cause dynamic textures not to work, among other effects
2010-02-05 18:09:27 +00:00
1b44711ceb
Clarify some names
2010-02-05 13:11:33 +00:00
b92cb6126d
Implement the friends data adaptor
2010-02-05 12:31:29 +00:00
044979066c
Fix two inconsistencies with LightShare
2010-02-05 00:53:32 +01:00
0a084a31e9
refactor: chain two ScenePresence constructors together to eliminate common code. No functional changes
2010-02-04 23:23:07 +00:00
16467f6654
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-04 22:22:18 +00:00
f1b99c4a7f
minor: one method doc
2010-02-04 21:35:56 +00:00
8556a9f1a8
Applying patch #4534 by Misterblue to fix ODE physics stickiness
2010-02-04 13:31:06 -08:00
776d62b9c6
Merge branch 'master' into careminster
2010-02-04 17:29:33 +00:00
2953bee1f4
Revert "change position of OnAttach event firing so that this also happens when a user teleports into a region"
...
The behavior introduced here is not compatible with SL
This reverts commit b6bee4999c
2010-02-04 17:11:06 +00:00
ae9362636e
Line endings cleanup
2010-02-04 17:00:16 +00:00
0ab8dd61d7
Finally cutting the gordian knot. Friends needs to be both a module and a
...
service, and never the twain shall meet. This finally opens up the path to
a working friends implementation
2010-02-04 12:21:14 +00:00
f9a61f2825
Some interface and data structure changes, add the missing method in friends
2010-02-04 10:51:36 +00:00
b9c3846e81
minor: remove some mono compiler warnings
2010-02-03 22:19:28 +00:00
b1dfcccc9a
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-02-03 22:14:58 +00:00
48134af616
Motor angular decay fix.
2010-02-03 16:20:13 -05:00
bde7f361fa
minor: remove one mono compiler warning
2010-02-03 19:46:33 +00:00
7c69badd3d
minor: remove one mono compiler warning
2010-02-03 19:34:08 +00:00
fc1ac25935
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-03 14:32:29 -05:00
2c7672a2b9
minor: add a smidgen of EventManager doc
2010-02-03 19:27:44 +00:00
1442ab08aa
minor: remove one mono compiler warning
2010-02-03 19:08:02 +00:00
cd4651041e
For each delegate added to events in the EventManager, catch and log but do not propogate any exceptions that come back
...
This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally
2010-02-03 19:04:31 +00:00
daa66c4811
add an IsRoot property to sop
2010-02-03 16:40:21 +00:00
c020fed1b8
minor: comment out a log line in ScenePresence
2010-02-03 15:46:24 +00:00
da62344822
minor: remove a couple of mono warnings
2010-02-03 15:40:59 +00:00
b6bee4999c
change position of OnAttach event firing so that this also happens when a user teleports into a region
2010-02-03 15:35:41 +00:00
11ed5dee3b
Commenting UserAgentService.VerifyClient(UUID sessionID, string token) for now until I understand better the client IP issue.
2010-02-02 19:41:46 -08:00
0f1a3f8ed2
Merge branch 'master' into careminster
2010-02-03 00:16:02 +00:00
fa121951d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-02-03 00:15:14 +00:00
88d0fc3b09
allow terrain collision events after regular collision check
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-03 00:15:04 +00:00
bbd41de6d5
refactor: move world comm message queueing into its own method
2010-02-02 20:38:58 +00:00
0faeaf98a6
minor: copy some method doc from the WorldComm implementation to the interface
2010-02-02 19:42:45 +00:00
dc82409106
minor: add method doc to sop.SetScriptEvents()
2010-02-02 19:04:06 +00:00
8c20610293
AngMotor update 1
2010-02-02 13:28:42 -05:00
0e23c5fffb
minor: add some documentation to EventManager.OnObjectGrab
2010-02-02 18:19:15 +00:00
96d5c8196a
minor: add reminder to lock SOG.Children before using it directly in order to avoid threading issues
2010-02-02 15:45:41 +00:00
d5ed92cf38
Merge branch 'master' into careminster
2010-02-02 03:56:29 +00:00
6478617c93
Revert "improve locking of m_items in SceneObjectPartInventory"
...
This reverts commit 968b9e160d
2010-02-02 03:49:00 +00:00
4eeddf3078
Bug fix for finding default regions if the specified one doesn't exist.
2010-02-01 16:52:42 -08:00
bb736cee6b
Beginning of friends.
2010-02-01 16:05:59 -08:00
08721be374
minor: rename GetScriptPrimType() to GetPrimType()
2010-02-01 22:33:15 +00:00
5432925a3b
move hollow sphere faces bug back up to LSL_Api.cs
2010-02-01 22:29:21 +00:00
ecc068fbe0
remove now duplicated shape code from LSL_Api.cs
2010-02-01 22:08:00 +00:00
3863cd1d23
Copy prim face color setting code from LSL_Api down into SOP so that non-LSL callers can use it
2010-02-01 21:35:05 +00:00
4c1740f7d8
Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing!
2010-02-01 20:15:36 +00:00
53a01dc422
Don't try to start attachment scripts or send updates if the attachment itself has been unsuccessful
2010-02-01 20:06:43 +00:00
8466f13976
Bug fix for getting region flags.
2010-02-01 07:53:55 -08:00
7896965d71
Batter debug messages.
2010-01-31 22:40:06 -08:00
35a245b67a
Assorted bug fixes related to hyperlinking
2010-01-31 22:35:23 -08:00
35de8e91ec
* Remove unnecessary debug message
...
* Bug fix in UserAgentService, logout
2010-01-31 17:27:56 -08:00
0b89afd3e5
* Simplified the configuration by having [DatabaseService] in it
...
* Fixed configuration issue for HGInventoryServerInConnector
* Corrected typos in debug messages
2010-01-31 14:37:22 -08:00
041594ed07
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
2010-01-31 13:01:23 -08:00
22a3ad7f6c
* Bug fix in XInventoryData -- groupOwned is an int in the DB
...
* Bug fix in InventoryServerInConnector -- m_config
2010-01-31 11:26:12 -08:00
40d8e91008
* Added a few files that were missing in the repo.
...
* New HGInventoryService which allows restricted access to inventory while outside
2010-01-31 11:10:57 -08:00
0473454876
Added missing file.
2010-01-31 11:04:32 -08:00
3112b04c85
Changed an error message to w warning message.
2010-01-30 16:18:38 -08:00
1ab8458b1c
Bug fix for making cross-grid login work.
2010-01-30 16:09:40 -08:00
a0d79e621c
Bug fix: change HGBroker to a INonSharedRegionModule
2010-01-30 15:43:10 -08:00
42f978a478
* HGScene is no more.
...
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
2010-01-30 09:23:07 -08:00
81a6f9a515
On the way to making HG inventory work. Inventory can now be accessed again. Assets are still broken.
2010-01-29 19:33:50 -08:00
5001f61c08
* HGGridConnector is no longer necessary.
...
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
2010-01-29 18:59:41 -08:00
4c1365f149
apply http://opensimulator.org/mantis/view.php?id=4486
...
fix compilation of mrm scripts using microthreaded parmeter
Thanks ziah
2010-01-30 00:15:37 +00:00
627df50646
Apply http://opensimulator.org/mantis/view.php?id=4504
...
Stop the REST console crashing when entering return on an empty line
Thanks BlueWall
2010-01-29 23:38:44 +00:00
05a3e37b85
Apply http://opensimulator.org/mantis/view.php?id=3334
...
Send continuous touch() events if the left mouse button is held down while moving over an object
This conforms with Linden Lab practice
Thanks Revolution
2010-01-29 23:12:08 +00:00
7b53067d6d
Apply http://opensimulator.org/mantis/view.php?id=4548
...
Fix command params check on fcache expire <datetime>
Thanks coyled
2010-01-29 21:52:13 +00:00
0cf88b34c9
use common sop2 setup for TestMergeOarV0_2()
2010-01-29 21:45:07 +00:00
68c7218fa1
make TestSaveOarV0_2() use a common part2 construction
2010-01-29 21:42:27 +00:00
0c3043a298
use common part1 createio nin TestMergeOarV0_2()
2010-01-29 21:37:25 +00:00
055d991cc1
minor: swap which part uses the automatically set up scene in TestMergeOarV0_2()
2010-01-29 21:33:11 +00:00
75dcd721de
use common part1 creation in ArchiverTests.TestLoadOarV0_2()
2010-01-29 21:27:14 +00:00
115e66218e
refactor out scene object 1 creation n ArchiverTetss
2010-01-29 21:10:14 +00:00
c1da07e4eb
factor out scene setup in ArchiverTests
2010-01-29 20:59:56 +00:00
968b9e160d
improve locking of m_items in SceneObjectPartInventory
2010-01-29 20:36:13 +00:00
ae2174d8f5
Add method to get all items with the same name from a particular prim
...
Extend load oar test to check loading of a sound item
2010-01-29 18:11:53 +00:00
0c81966c0a
Works for grid login.
2010-01-29 09:12:22 -08:00
0c5850237e
Small fix for a spurious exception
2010-01-29 16:50:00 +00:00
9e37d24624
Prevent empty ObjectProperties packets being sent
2010-01-29 11:47:45 +00:00
44c86cedcf
Resolve one more conflict I overlooked
2010-01-29 07:47:50 +00:00
536a6bac72
Resolve one more conflict I overlooked
2010-01-29 07:42:45 +00:00
a87a247f05
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e
2010-01-29 07:21:06 +00:00
cfca9e1e81
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e
2010-01-29 07:20:13 +00:00
00f7d622cb
HG 1.5 is in place. Tested in standalone only.
2010-01-28 19:19:42 -08:00
5b9ca6e35f
Merge branch 'master' into careminster
2010-01-28 14:38:46 +00:00
ee12b00cfa
Fixes inconsistencies in the permissions module. Adds a region_manager_is_god
...
configurable. Previously, estate managers could enter god mode, but would
not have any powers. Now estate managers can enter god mode only if this
option is true, and then will have real god powers.
2010-01-28 14:34:31 +00:00
862caa72a8
Fixes terrain editing. Changes ThrottleOutPacketType to task instead of land.
2010-01-28 03:04:38 +00:00
2d9b69c186
Merge branch 'master' into careminster
2010-01-28 02:07:18 +00:00
6478bc9fb0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-28 02:05:32 +00:00
c26f1d1bfa
Changes WorldCommModule to ISharedRegionModule.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-28 02:05:05 +00:00
7c00469cd2
Added ExternalName config on Gatekeeper.
2010-01-27 08:00:29 -08:00
910d2177ad
* .. More Endlines...
2010-01-26 12:49:53 -05:00
d28542e4d4
more endlines..
2010-01-26 12:47:27 -05:00
ccf7bfe09b
* a few more endlines..
2010-01-26 12:44:42 -05:00
bc68f77396
* A few other endlines...
2010-01-26 12:41:37 -05:00
027ad49567
* Fix Endlines in Mock/TestClient.cs
2010-01-26 12:23:06 -05:00
ed11a55f85
* Fix Endlines in SirikataClientView.cs
2010-01-26 12:20:41 -05:00
8284fc8e22
* Fix Endlines in IRCClientView.cs
2010-01-26 12:19:38 -05:00
d19045becd
* Fix Endlines in VWHClientView.cs
2010-01-26 12:17:55 -05:00
5e58bca86d
* Fix Endlines in MyNpcCharacter.cs
2010-01-26 12:15:49 -05:00
e9c9a74e0a
Some merge fixups
2010-01-26 15:12:41 +00:00
b80ea00265
Merge branch 'master' into careminster
2010-01-26 14:53:14 +00:00
72dd680dd3
Replace dome tabs with spaces
2010-01-26 14:46:53 +00:00
19484891bb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-26 14:44:07 +00:00
38cfc9366c
Fix a problem where llDie() calls were sometimes leaving dead objects behind.
...
When an object was deleted, the remove script instance call was aggregating the scripting events as normal.
This would queue a full update of the prim before the viewer was notifed of the deletion of that prim (QuitPacket)
On some occasions, the QuitPacket would be sent before the full update was dequeued and sent.
In principle, you would think that a viewer would ignore updates for deleted prims. But it appears that in the Linden viewer (1.23.5),
a prim update that arrives after the prim was deleted instead makes the deleted prim persist in the viewer. Such prims have no properties
and cannot be removed from the viewer except by a relog.
This change stops the prim event aggregation call if it's being deleted anyway, hence removing the spurious viewer-confusing update.
2010-01-25 21:51:58 +00:00
19d4867af7
* Quick fix to Remote Console session ID handling.
2010-01-26 07:40:33 +11:00
70465f4c90
Removed obsolete interface IHyperlink.
2010-01-24 16:23:18 -08:00
8ddf787cfd
Hypergrid map search back on, this time with a config var in the grid service.
2010-01-24 16:00:28 -08:00
ea3d287f70
Some method implementations were missing from LocalGridServiceConnector.
2010-01-24 15:04:41 -08:00
48b03c2c61
Integrated the hyperlinking with the GridService.
2010-01-24 14:30:48 -08:00
fe06f0dd05
Fixes Region Crossings on a prim.
2010-01-24 11:35:30 +00:00
1254a5e50c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-23 15:19:05 +00:00
ec3c31e61e
Updates all IRegionModules to the new style region modules.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-23 15:18:52 +00:00
1df69be9a6
Add first part of test for checking restore of task inventory items on oar load
...
Passes but not yet complete
2010-01-22 20:32:34 +00:00
a0e4665077
complete assertion checks of all other oar loaded region settings
2010-01-22 17:17:25 +00:00
2308b375a7
minor: remove warning from LLClientView
2010-01-22 16:26:42 +00:00
5f5fdc3624
Allow oar loading to work even if an estate module is not present
...
Write bare bones unit test for region setting loads
2010-01-22 16:22:23 +00:00
e61f42ad3a
add a target position to agent updates to ScenePresence to support alternative client protocols
2010-01-21 23:59:04 -08:00
d2e17f4ffb
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-01-21 23:48:11 +00:00
1abb70cc73
Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associated methods.
2010-01-21 19:31:02 -05:00
946e06eb58
Merge branch 'master' into careminster
2010-01-21 23:47:40 +00:00
14e62c096d
Fixes llSetDamage. Patch from Revolution
2010-01-21 23:30:49 +00:00
66692f90e3
ChODE Object Linear Motion update
2010-01-21 14:39:11 -05:00
a964431c21
Merge branch 'master' into casper
2010-01-20 22:19:14 +01:00
496a8a4f7c
Fixed an issue with PayPrice sometimes being shared between multiple objects
2010-01-20 22:14:43 +01:00
c211a120a5
Console output no longer requires loglevel to be set to info; you can run the simulator with log level WARN or ERROR and see the output of console commands
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-20 00:16:08 +00:00
5908b8ed7c
Change a member of the friendslist module to better reflect the client side
...
data storage paradigm of the friends list and avoid repeated, unneccessary
fetches of the entire friends list.
2010-01-19 11:33:42 +00:00
a3f48a7ca6
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
2010-01-19 04:18:01 +00:00
9fbcceb1db
* Towards enabling hyperlinks at grid-level.
...
* Updated grid configs
2010-01-18 20:35:59 -08:00
fe5d80a285
Add a Hyperlink flag to the regions table
2010-01-19 04:17:27 +00:00
24056dc98b
Adds example to OpenSim.ini.example for Admin Default Parcel settings
2010-01-19 01:46:50 +00:00
5feeea00ae
Check for impersonations at the Gatekeeper.
2010-01-18 17:00:06 -08:00
3d53694415
Go Home works. With security!!
2010-01-18 16:34:23 -08:00
fd64823466
* Added missing GatekeeperServiceConnector
...
* Added basic machinery for teleporting users home. Untested.
2010-01-18 10:37:11 -08:00
2257431cba
Comment the asset deletion handler. It can be abused and is not currently
...
needed.
2010-01-18 17:36:38 +00:00
6772c9d2b6
Comment the asset deletion handler. It can be abused and is not currently
...
needed.
2010-01-18 17:35:49 +00:00
e3dbd79543
Merge branch 'master' into careminster
2010-01-18 17:24:21 +00:00
bbbe9e73cc
* Fixed misspelling of field in GridService
...
* Moved TeleportClientHome to EntityTransferModule
2010-01-18 09:14:19 -08:00
d9c48e70a9
Fix a major security problem with osSetDynamicTexture which allowed the deletion of /any/ asset.
2010-01-18 17:56:27 +01:00
3ff28e7a8f
Fix a major security problem with osSetDynamicTexture which allowed the deletion of /any/ asset.
2010-01-18 16:52:06 +00:00
b5fcb5e872
HG teleports through gatekeeper are working.
2010-01-17 20:10:42 -08:00
51bb311565
Add chat banning. Staff patch
2010-01-18 02:53:31 +00:00
b2e6ec9e12
Agent gets there through the Gatekeeper, but still a few quirks to fix.
2010-01-17 18:04:55 -08:00
f4e30664e6
Fix a typo
2010-01-18 01:55:54 +00:00
44d523518a
Adds land ejection and freezing. Adds more checks to land banning.
2010-01-18 01:27:01 +00:00
5e034f5933
Oops, forgot this one.
2010-01-17 11:35:27 -08:00
f276ba57bf
HG agent transfers are starting to work. Gatekeeper handlers are missing.
2010-01-17 11:33:47 -08:00
724b1d152b
Copyright notices.
2010-01-17 08:42:08 -08:00
a7309d90da
* Added ServiceURLs to AgentCircuitData.
...
* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
2010-01-17 08:40:05 -08:00
bd4d94a4f5
Hyperlinking minimally tested and working.
2010-01-17 07:54:03 -08:00
6dceb8b4a9
These 2 were moved to corresponding Hypergrid folders. The server connector was renamed to Gatekeeper, because it will have all the handlers for the gatekeeper.
2010-01-17 07:37:43 -08:00
04e29c1bac
Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet.
2010-01-16 21:42:44 -08:00
ee1fb81376
Finished moving object crossings into EntityTransferModule
2010-01-16 08:42:20 -08:00
5ce12c92d9
Fixed a missing field in the last regions table migration.
2010-01-16 08:32:32 -08:00
bd6d1a2444
Moved prim crossing to EntityTransferModule. Not complete yet.
2010-01-16 07:46:07 -08:00
74b3ce8572
Let monitor data be requested using either the short form of the name or the
...
full, namespace qualified version.
2010-01-16 04:57:49 +00:00
dc6d37d2fe
Merge branch 'master' into presence-refactor
2010-01-16 04:40:33 +00:00
c9276f2051
Shorten the names of the tags in monitorstats summary to the immediate type
...
name sans namespace. Needs adjustment of scripts using these!.
Request my name still uses full namespace path.
2010-01-16 04:38:24 +00:00
32bfbdab6f
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-01-15 17:24:41 -08:00
f5cba18600
Comment
2010-01-15 17:17:24 -08:00
4ac3c0e81b
Renamed IAgentTransferModule to IEntityTransferModule -- accounts for objects too.
2010-01-15 17:14:48 -08:00
8c39392eaa
Merge branch 'master' into careminster
2010-01-16 00:15:26 +00:00
10f8c2ea9b
Merge branch 'master' into presence-refactor
...
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
8d5a5d6a4d
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-01-15 15:13:11 -08:00
f1c30784ac
* General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic.
...
* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too
2010-01-15 15:11:58 -08:00
686660650b
Implement region registration with authentication
2010-01-15 21:57:31 +00:00
d49cc7ca90
Implement "Reservation" flag behavior.
2010-01-15 21:35:10 +00:00
344d27b19d
Implement the NoMove behavior. Cause Reservation flag to be reset on
...
first connect
2010-01-15 21:23:59 +00:00
0d5f182c02
Add a handful of new region flags and a small migration
2010-01-15 21:13:57 +00:00
884410501e
Allow renaming of items that contain no-mod items
2010-01-15 20:19:06 +00:00
e9d376972f
Added a UserAccountCache to the UserAccountServiceConnectors. Uses a CenomeCache.
2010-01-14 08:05:08 -08:00
4bae547ecb
Added the 2 missing methods in the grid service remote connections.
2010-01-14 06:36:39 -08:00
88d2adc93c
add an agent position field to AgentUpdateArgs for use by some non-LL clients
2010-01-14 02:16:40 -08:00
369e57beee
Take the verbose debug messages in AgentHandler out again.
2010-01-13 21:34:29 -08:00
e90a5895ad
Bug fix in releasing agent. In Scene, always use SimulatonService, and not m_SimulationService, because it may be null...
2010-01-13 21:32:48 -08:00
a87d7a1296
Adds Land Banning.
2010-01-14 04:11:17 +00:00
daa9866a9a
Omit AuthorizationService from the default configurations, because the service doesn't exist in the distribution.
2010-01-13 19:25:33 -08:00
5dcb14726d
Make the auth module silent when there is no configuration for it
2010-01-14 02:42:15 +00:00
283ff593b1
Make use of Fallback regions when the desired start region is having problems.
2010-01-13 18:30:33 -08:00
f0152790cf
Merge branch 'master' into careminster
2010-01-14 01:20:07 +00:00
ab021aaa25
Make region flag specs work for regions whose names contain spaces. Uses underscore in place of spaces. Region_Word1_Word2.
2010-01-13 15:42:43 -08:00
c5aeb4ba77
Removed unnecessary debug message.
2010-01-13 15:35:45 -08:00
14ab9b04c4
LL Login now uses default regions if the desired start location is not found.
2010-01-13 15:28:46 -08:00
24ab3e2d5f
Fixed mixed-case use in UserAccounts table. Plus some more sanity checks on filling out the UserAccount data.
2010-01-13 14:16:05 -08:00
e09c9fbe14
Bug fix: if user doesn't have an avatar in storage, create one upon first login.
2010-01-13 10:20:02 -08:00
d939668d6a
Bug fix in create user: create inventory was missing.
2010-01-13 10:15:14 -08:00
901e94c836
One more buglet removed: send the region UUID, not the region handle.
2010-01-13 09:54:27 -08:00
640712fe88
* Removed debug messages.
...
* Everything works! (everything that was tested; lots of things to test)
2010-01-13 09:38:09 -08:00
4de82891a9
Bug in Teleport fixed -- Appearance was missing from AgentCircuitData.
2010-01-13 09:34:08 -08:00
7356860b48
Several more buglets removed.
2010-01-13 09:17:30 -08:00
482dcb7e89
Fix a bad error message
2010-01-13 03:59:35 +00:00
e3a04fcb7b
Change the error messages on region region registration. This changes URM
...
and region. The non-error case should be compatible, so no version bump.
Untested.
2010-01-13 03:08:34 +00:00
a8b1a57cd1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-01-12 10:27:21 -08:00
a4a0512011
Bug in llGetNumberOfPrims always returns to script when no clients are connected to the simulator.
2010-01-12 10:23:36 -08:00
011a1b3798
More appearance woes fixed, this time for child agents. Tested on a grid with 2 simulators. Everything seems to be working, including border crosses. TPs (prim crossing) need love now.
2010-01-12 09:49:27 -08:00
66920a9047
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
2010-01-12 09:22:58 -08:00
77e43f4801
Fixed a couple of bugs with Appearance. Appearance is all good now.
2010-01-11 17:30:05 -08:00
7467a471ca
Add the option to reject duplicate region names
2010-01-11 22:52:05 +00:00
4e7c449c5a
This fixes the problem that region modules (new style) weren't being recognized.
2010-01-11 14:39:15 -08:00
07aaad0d10
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-01-11 21:00:28 +00:00
b88bee9d48
add interface/method documentatio nto IScriptModuleComms
2010-01-11 17:17:58 +00:00
d86c0d406a
more specific config error logging
2010-01-11 17:15:49 +01:00
19ad68e5e4
Moved MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); around, because it was crashing. Now it crashes elsewhere.
2010-01-11 08:11:04 -08:00
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
001d369568
CommunicationsManager deleted.
2010-01-11 07:45:47 -08:00
9c668558d4
minor: formatting
2010-01-11 15:00:16 +00:00
8452c0869d
Merge branch 'master' into careminster
2010-01-11 08:00:03 +00:00
ff55ae0eb2
Make console_port work.
2010-01-11 07:59:13 +00:00
ca75ad6743
Remove CreateCommsManagerPlugin
2010-01-11 05:13:47 +00:00
bfddd75ca8
Refactor. Instantiate sim status handlers in opensim base, not in a plugin
2010-01-11 05:12:01 +00:00
15a11e9745
Refactor. Move MainServer init to a place with greener grass
2010-01-11 05:03:56 +00:00
7e6980b20d
dust
2010-01-10 21:43:41 -08:00
751e70af78
NetworkServersInfo removed from CommsManager.
2010-01-10 21:37:36 -08:00
cddd48aeea
Some more unnecessary things deleted in Framework.Communications.
2010-01-10 21:00:03 -08:00
dc4bbf6065
All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService.
2010-01-10 20:29:09 -08:00
5cf6d6fa79
All grid servers deleted, including user server. They served us well.
2010-01-10 20:17:37 -08:00
20e748205e
Merge branch 'master' into careminster
2010-01-11 03:50:24 +00:00
2415d36bed
OpenSim.Region.Communications.* is no more. Thanks to everyone who contributed to these!
2010-01-10 19:50:09 -08:00
2b478a61d0
Add the console port setting to ROBUST, too
2010-01-11 03:49:05 +00:00
0c2946031b
CommunicationsManager is practically empty. Only NetworkServersInfo is there.
2010-01-10 19:42:36 -08:00
e966e51b89
Add a console_port setting to let the rest console use a different port
...
from the region server
2010-01-11 03:29:24 +00:00
49618dc102
Moved GridInfo service from where it was to Handlers/Grid
2010-01-10 19:19:34 -08:00
649d45a2d4
Merge branch 'master' into careminster
2010-01-11 02:04:58 +00:00
2320b17ca9
Whitespace cleanup
2010-01-11 02:04:05 +00:00
0ae861d7d7
Merge branch 'master' into careminster
2010-01-11 02:01:23 +00:00
a0859754c0
Adds llRotTarget and the events at_rot_target and not_at_rot_target.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-11 02:00:40 +00:00
7624184b15
Removed refs to OpenIdService in UserServer.
2010-01-10 17:21:32 -08:00
eb6d49e02c
Fixed small inconsistency in config var name.
2010-01-10 17:19:40 -08:00
b0bbe861cd
Moved OpenId authentication from user server to Server.Handlers.Authentication.
2010-01-10 17:15:02 -08:00
68b7307f4f
Forgot to remove 'using'
2010-01-10 16:34:01 -08:00
53e83e5dbb
* Starting to clean the house...
...
* Fixed circular dependency
2010-01-10 16:20:59 -08:00
e31131b40f
Some typos fixed related to master avie removal
2010-01-10 15:41:49 -08:00
e3d1d824e1
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-01-10 15:39:49 -08:00
c0642bf7e0
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-01-10 15:35:15 -08:00
4dd523b45d
* Changed IPresenceService Logout, so that it takes a position and a lookat
...
* CommsManager.AvatarService rerouted
2010-01-10 15:34:56 -08:00
b5f1857d34
Remove a little bit more if master avatar
2010-01-10 22:55:43 +00:00
3c90d834ea
Remove all references to master avatar, replacing with estate owner where
...
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
2010-01-10 22:41:42 +00:00
6998668bbc
* Last reference to CommsManager.UserProfileCacheService removed
...
* Grided-sims added the Library module
2010-01-10 14:12:03 -08:00
511481e8d9
Merge branch 'master' into careminster
2010-01-10 19:59:49 +00:00
2bf49cc1bb
Clean CRs from previous patch
2010-01-10 19:58:44 +00:00
038ec133e6
Adds land collision events.
...
CRs cleaned from patch
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-10 19:58:18 +00:00
1e1b2ab221
* OMG! All but one references to UserProfileCacheService have been rerouted!
...
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08:00
78e9dc7c2c
Add a "LockedOut" flag to allow locking a region out via the grid server.
...
This flag prevents registration of a known region
2010-01-10 04:23:23 +00:00
1676e70dfe
Merge branch 'master' into careminster
2010-01-10 04:16:06 +00:00
45b19e5e2d
Fix a small bug in login disable code
2010-01-10 04:05:19 +00:00
b9e6f4583c
Implement access module commands
2010-01-10 03:48:10 +00:00
b0a7bcb2c8
Add "StartDisabled" to [Startup] to make all regions start up with
...
logins disabled until enabled from the console. Add the AccessModule (WIP)
2010-01-10 03:17:40 +00:00
81d5a4b6d8
Remove "login disable", "login enable" and "login status" commands.
2010-01-10 03:03:18 +00:00
9727e3d66b
Add "Persistent" flag to regions table flags values
2010-01-10 02:44:57 +00:00
e189b3056f
Add last_seen field to regions table
2010-01-10 02:13:55 +00:00
21de921b95
Make the new API return only the regions that are marked online
2010-01-10 02:07:10 +00:00
7403f2fd36
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
2010-01-10 01:46:56 +00:00
7cb66de2e0
* Moved command reset password from OpenSim to UserAccountService.
2010-01-09 18:16:14 -08:00
96ecdcf9c5
* Added SetPassword to IAuthenticationService.
...
* Added create user command to UserAccountService. Works.
* Deleted create user command from OpenSim.
2010-01-09 18:04:50 -08:00
d889d4e1fa
Finally the region service config stuff is in.
2010-01-10 01:46:34 +00:00
7a352edd5a
Add some commands to the grid server
2010-01-10 01:02:03 +00:00
59ecd6d151
Temp fix: initialize flags value to prevent exception
2010-01-09 23:25:34 +00:00
46b5fe5acd
Merge branch 'master' into careminster
2010-01-09 20:54:59 +00:00
49c09ef24c
Fixes prim to prim collision.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-09 20:47:58 +00:00
28d6705358
Preliminary work on the new default region setting mechanism
2010-01-09 20:46:32 +00:00
25fdbd6cbc
Less refs to UserProfileCacheService. Compiles but likely doesn't run.
2010-01-09 09:09:32 -08:00
089f5403a7
Merge branch 'master' into careminster
2010-01-09 16:35:32 +00:00
bc558788c2
A last fix for estate access by group. One should send the correct list.
2010-01-09 16:32:14 +00:00
1597e33549
Merge branch 'master' into careminster
2010-01-09 15:59:33 +00:00
673a52fa7a
Implement the groups module query to make the estate allowed groups work
2010-01-09 15:58:18 +00:00
121c6b4835
Merge branch 'master' into careminster
2010-01-09 15:34:58 +00:00
332463ca94
Fix up the weird Lindenish "setaccess" message. Talk about strange....
2010-01-09 15:28:52 +00:00
a764eb5dc7
Merge branch 'master' into careminster
2010-01-09 14:21:50 +00:00
063f106cbb
Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users
...
will be honored now, while allowed groups will not. This requires additional
groups module integration work
2010-01-09 14:17:44 +00:00
d22bdb5095
Merge branch 'master' into careminster
2010-01-09 12:02:48 +00:00
6b60f3cce5
A few more inches... Old friends things removed. Less references to UserProfileService.
2010-01-08 20:31:29 -08:00
a2aadb78a9
Maintain control() event stream
2010-01-08 23:12:11 -05:00
bc68390b14
The first 2 handlers for the XInventory system.
2010-01-08 22:51:37 +00:00
c76c80a28a
Adds IClientAPI voids for GroupProposals.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-08 18:27:49 +00:00
d14589d1ab
Add migrations to add fields to user and auth tables
2010-01-08 18:10:59 +00:00
b63405c1a7
Inching ahead... This compiles, but very likely does not run.
2010-01-08 10:43:34 -08:00
22b1ffdc6c
Fix repeated ArgumentOutOfRangeException when a local OpenSim console is resized under mono
...
May fix mantises 3186, 3270, 4022, 4238
2010-01-08 14:45:40 +00:00
3bf69aa5a3
Change ConsoleClient to allow quoted values to be passed through. This
...
allows setting the login message remotely on the user server console
2010-01-08 11:02:39 +00:00
bba557aff6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-08 05:31:31 +00:00
17efecd6c5
Moving the new group data structures out of LLClientView into GroupData.
...
The new methods are still not in IClientAPI, so some work remains to be done.
2010-01-08 05:29:29 +00:00
452be5e546
Second Fix to the new Packets as per Melanie's request.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-08 05:17:02 +00:00
71adb37fa8
Fix llRotBetween
2010-01-07 23:58:19 -05:00
6591f8a592
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-01-07 23:04:28 -05:00
f11a97f12d
* Finished SimulationServiceConnector
...
* Started rerouting calls to UserService.
* Compiles. May run.
2010-01-07 15:53:55 -08:00
1e899704c1
Adds config option "ForwardOfflineGroupMessages" to allow disabling of group messages forwarded while offline. Addresses Mantis #4457
2010-01-07 11:28:38 -08:00
b67470af91
Fixes the newly added packets as per Melanie's request.
...
Provisionally applied to fix the naming. Signatures are still subject to change.
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-07 15:09:13 +00:00
7dd43bef8c
Fixes the Collision errors and adds more to llGetStatus
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-07 10:14:59 +00:00
6d061d9f39
Complete the XInventoryConnector. Flesh out the skeleton for the
...
XInventoryInConnector
2010-01-06 22:00:19 +00:00
68eba8973c
Adding a skeleton for the XInventoryInConnector, counterpart to the already
...
done XInventoryConnector. No functionality yet.
2010-01-06 19:16:43 +00:00
a542871c15
Allow estate managers (if estate_owner_is_god is set) to actually enter
...
god mode. Allow god modification of objects if the object owner is the
same god that wants to modify, this allows you to regain perms on your
own objects after IAR import messed them up.
2010-01-05 16:04:57 +00:00
3724a38ab4
Allow estate managers (if estate_owner_is_god is set) to actually enter
...
god mode. Allow god modification of objects if the object owner is the
same god that wants to modify, this allows you to regain perms on your
own objects after IAR import messed them up.
2010-01-05 15:39:53 +00:00
aca01f5415
Add the XInventoryServicesConnector, a new inventory connector without the cruft
...
of the old one that makes inventory crash on folder creation. This is just
the connector part, the handler is still ont he todo list.
2010-01-05 04:22:03 +00:00
be41ba6670
Allow lists to be embedded in query strings
2010-01-05 03:17:45 +00:00
cbe434149e
Change the signature of the forms requester data in preparation to getting
...
to where lists can be sent as requests
2010-01-05 03:17:37 +00:00
4799f1ce92
Add the unfinished XInventoryConnector. Intermediate commit, will NOT compile!
2010-01-05 03:13:19 +00:00
28ba16ee53
Add the port of the XInventoryService for the new Sqlite framework
2010-01-05 00:35:54 +00:00
033a3da254
Sqlite framework and generic handler. They compile. More I cannot say.
2010-01-04 23:30:38 +00:00
7f960cd595
Merge branch 'master' into presence-refactor
2010-01-04 21:41:33 +00:00
1ae9bfc074
Finish conversion if XInventoryService
2010-01-04 20:53:28 +00:00
e76333555d
First stage port of the XInventoryService
2010-01-04 20:53:26 +00:00
0907d5d69e
Finish conversion if XInventoryService
2010-01-04 20:52:44 +00:00
53d3f46add
First stage port of the XInventoryService
2010-01-04 18:47:47 +00:00
d657b76dba
Merge branch 'master' into careminster
2010-01-04 06:17:38 +00:00
3740775472
When rezzing a no-copy object on a no-rez parcel, the object vanishes from
...
inventory until relog. This patch corrects this and puts the item back into
inventory.
2010-01-04 06:16:04 +00:00
f198c68547
Mark GetUserInventory as obsolete. It is still used in the default
...
avatars module and in the REST inventory service, but future inventory
services and/or connector will not include this method anymore, because
it is dangerous on large inventory servers. Marking as obsolete to give
an incentive to rewrite these services to use the recursive fetching
or more targeted retrieval.
2010-01-04 05:34:32 +00:00
253e2ed699
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-01-03 23:10:01 -05:00
d4d55b4f4b
Add the data service
2010-01-04 02:53:22 +00:00
6e8d94685d
AvatarStore. Untested, but complete
2010-01-04 02:52:43 +00:00
791c6188fd
Some work on avatar service. Retrieval and storage done
2010-01-04 02:07:31 +00:00
3c18c0189a
Avatar appearance skeleton
2010-01-04 00:56:39 +00:00
1121919b57
Solve conflict
2010-01-03 22:02:36 +00:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
e69ec1108f
Cause llSetText to send prim updates.
2010-01-03 21:42:22 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
99efa99585
Successfully logged into a grid.
2010-01-03 11:44:57 -08:00
c268e342d1
* Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle.
...
* Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now.
* Completed SimulationServiceConnector and corresponding handlers.
2010-01-03 09:35:12 -08:00
ae1bdaa7b5
Applied fix for avatar connectors similar to yesterday's fix of user account connectors.
2010-01-03 07:03:14 -08:00
8bed461957
Test client for remote user account connector and service. It seems to be working.
2010-01-02 20:16:21 -08:00
f8c79fe20a
Flattening the ServiceURLs
2010-01-02 20:11:59 -08:00
489a4752a5
Change the requester a little
2010-01-03 03:24:06 +00:00
08b507517b
Test client for remote presence connector, and for the service itself. Connector seems to work well.
2010-01-02 18:18:13 -08:00
6da6b8d9c5
* Converters from new AvatarData to old AvatarAppearance and vice-versa
...
* Login now retrieves AvatarData from AvatarService and sends it off with the agent data
2010-01-02 16:26:40 -08:00
28702f585f
* Avatar service connectors all in place, but untested.
...
* Fixed a typo in RemoteUserAccountServiceConnector module.
2010-01-02 15:07:38 -08:00
71fdc24f5c
Add virtual method StateChange to ScriptBaseClass
2010-01-02 21:21:31 +01:00
e73eb55ad8
Changed the rest of references to IAvatarData to AvatarData
2010-01-02 12:18:22 -08:00
9f273717a2
Add virtual method StateChange to ScriptBaseClass
2010-01-02 19:43:54 +00:00
3a19c85803
Change to a class
2010-01-02 19:32:46 +00:00
90b65338e6
Strip the lindenisms from the interface
2010-01-02 19:29:02 +00:00
7c06634e52
Clarifying comments.
2010-01-02 11:43:29 -08:00
78173996b9
First stab at avatar data. Very generic
2010-01-02 17:50:15 +00:00
c5149fe229
Minor interface changes
2010-01-02 17:42:41 +00:00
dbb16bf2db
* Forgotten ILibraryService from yesterday
...
* New IAvatarService -- first pass
2010-01-02 09:54:46 -08:00
8a9677a531
The Library Service is now working. UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible.
2010-01-01 21:12:46 -08:00
ec53301e63
Forgotten modules in prior commit.
2010-01-01 18:59:54 -08:00
4240f2dec6
New LL login service is working! -- tested in standalone only. Things still missing from response, namely Library and Friends. Appearance service is also missing.
2010-01-01 16:54:24 -08:00
0d9591bf35
Prevent the creation of duplicate inventory folders in the case of a login
...
database issue. Now the login will instaead fail later.
2010-01-01 22:51:00 +00:00
4bca697865
Remove the inner Md5 to let the auth service handle md5 passwords
2010-01-01 18:08:02 +00:00
c540c93b54
Auth data migration.
2010-01-01 08:45:41 -08:00
1387919c20
Yes! First test of new login service done still in 2009! Bombs in auth, because the data migration is missing. Will fix it next year...
...
* HAPPY NEW YEAR!
2009-12-31 20:51:35 -08:00
5ab871cb6a
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-31 19:58:42 -08:00
20318dba05
Finally restire the EMPTY friends module (what a mess)
2010-01-01 02:05:19 +00:00
1427572294
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-31 17:19:22 -08:00
130c80efe0
A lot more beef on the login service. The LLLoginResponse is a MONSTER! Almost done...
2009-12-31 17:18:55 -08:00
61f63fdc38
Put PassCollision on the ignore list for testing, since we don't save that
...
yet.
2009-12-31 23:51:53 +00:00
aa51b83fdc
Merge branch 'master' into careminster
2009-12-31 23:31:45 +00:00
872387d278
Merge branch 'master' into presence-refactor
2009-12-31 23:30:41 +00:00
a876cfad01
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
2009-12-31 23:30:09 +00:00
3ec502f551
Readds llCollisionFilter and adds llPassCollision.
...
Applied with whitespace cleanup
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 23:29:32 +00:00
0ce9be653d
* Added the Login server handlers that were lost in yesterday's commit grief
...
* More beef to the LLLoginService
* Better design for handling local simulation service
2009-12-31 14:59:26 -08:00
b321c0a932
Merge branch 'master' into careminster
2009-12-31 21:53:39 +00:00
e6cd7f28de
Readds llCollisionFilter and adds llPassCollision.
...
Applied with whitespace cleanup
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:42:52 +00:00
004c751a1b
Whitespace cleanup (changed hard tabs to 4 spaces)
2009-12-31 21:36:04 +00:00
8ca37dbefa
Adds Friend Finding functionality.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:31:04 +00:00
234d4e1105
Adds tons of packets.
...
Applied with change: Changed spelling to Summary (from Summery)
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 21:24:56 +00:00
3f901d313b
Vehicle Linear parameter adjustments
2009-12-31 16:07:36 -05:00
f4efa325bb
More progress on both the Simulation service and the Login service. Both still unfinished.
2009-12-31 11:42:33 -08:00
a8901a40f4
Simulation handlers (agents & objects) completed.
2009-12-31 09:25:16 -08:00
67cfe34e67
Merge branch 'master' into careminster
2009-12-31 06:42:33 +00:00
9c4e6f060a
This patch caused serialization errors and needs to be reexamined
...
Revert "[PATCH] Adds llCollisionFilter"
This reverts commit eab2b4c6a9
2009-12-31 06:41:10 +00:00
c664307126
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-30 21:00:52 -08:00
b29ae72460
First pass at the new login service. Still incomplete, but doesn't disrupt the existing code.
2009-12-30 21:00:16 -08:00
643cc7a0ee
Merge branch 'master' into careminster
2009-12-31 04:53:05 +00:00
b3cb99036c
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-31 06:21:03 +01:00
9602227eb6
Add a small delay in NewAgentConnection to fix an issue with Hippo
...
(and possibly other cleints) getting their data mixed up.
2009-12-31 06:20:35 +01:00
eab2b4c6a9
[PATCH] Adds llCollisionFilter
...
Thank you, Revolution. Applied with minor changes.
2009-12-31 04:48:59 +00:00
87959464c9
Adds osKickUser and osSetSpeed
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-31 03:56:55 +00:00
01f6aee020
Implement avatar picker queries
2009-12-31 02:26:00 +00:00
99ad7aac7f
Implement saving user account data
2009-12-31 01:34:03 +00:00
3507005d9d
Remove CreateUserAccount. Rename SetUserAccount to StoreUserAccount.
...
Implement the fetch operations fully. Rename one last UserService file to
UserAccountService
2009-12-31 01:16:16 +00:00
96f387ce49
Make ScopeID be wild on user queries. Just pass it as UUID.Zero
2009-12-30 22:44:04 +00:00
a21ce9151b
Merge branch 'master' into presence-refactor
2009-12-30 22:24:14 +00:00
bda18c33fd
Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor
2009-12-30 22:23:58 +00:00
b6097ae9a8
Some modifications to user service. Query by name is implemented now
2009-12-30 22:23:17 +00:00
1d2a332b96
Unit tests for presence. They helped fix a couple of wrongnesses.
2009-12-30 14:17:18 -08:00
e6c71d6df6
* Fixes Sitting on the ground.
2009-12-30 15:55:49 -05:00
5e103f2b2e
Revert "Merge branch 'master' into careminster"
...
This reverts commit d49d44923d
2009-12-30 20:26:22 +00:00
d49d44923d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2009-12-30 20:25:57 +00:00
cbe0841bc9
Revert "Merge branch 'master' into careminster"
...
This reverts commit 596af3f600
2009-12-30 20:13:18 +00:00
596af3f600
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2009-12-30 20:12:21 +00:00
16a64c400b
* Makes forward and backward key reactions faster by responding to the NUDGE type movements.
2009-12-30 15:01:14 -05:00
2205d1c486
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-12-29 22:00:01 -05:00
25544ac04a
* Attempts to resolve the megaregion terrain edit rebound.
...
* It does this by tweaking the throttles on child agent connection to a megaregion and multiplying the land throttle by 50. (various bit and byte magic ensue)
* While, I doubt this will cause terrain crater sized potholes.. since it actually increases the bandwidth available for land in child regions when MegaRegions area active, more testing would be good.
* This, in theory, also shouldn't cause missing objects in child regions.. because all objects are in the root region anyway. As I said, more testing would be good.
2009-12-29 21:59:19 -05:00
170a04ce41
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-29 17:21:37 -08:00
be2f033626
More renames to make everything consistent. This is the UserAccountService.
2009-12-29 17:21:16 -08:00
28516e2648
Fixed a couple of bugs that were bombing the data migration.
2009-12-29 16:51:59 -08:00
8f0d6d6b5c
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:37:28 +00:00
917fad40da
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:36:54 +00:00
6a4c578e5e
Fix an omission in LSL that causes a viewer crash
2009-12-30 00:36:16 +00:00
88d2df597e
* Fixed names.
...
* Added configs for Standalone
* Changed UserSericeBase to use useraccounts instead of user
2009-12-29 16:34:02 -08:00
81bcedda83
Renamed user account modules to be consistent
2009-12-29 16:06:21 -08:00
b4483df270
* All modules and connectors for user account service are in place. Untested.
...
* Cleaned up a few things on presence connectors
2009-12-29 15:58:40 -08:00
a08360e3cd
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-30 00:27:34 +01:00
06f639b8f3
Fix a timer list locking issue causing XMREngine deadlocks
2009-12-30 00:27:01 +01:00
2294683f07
Tighten up the IUserService interface again. No need for auth tokens at this level.
2009-12-29 13:39:21 -08:00
6eb5754f5a
Polished the IUserService interface.
2009-12-29 13:27:21 -08:00
8631cea215
Change the interface a bit before someone depends on it's current form
2009-12-29 20:14:26 +00:00
ba3dfe4121
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2009-12-29 18:42:30 +00:00
67cfac0cf1
Merge branch 'master' into careminster
2009-12-29 18:41:45 +00:00
0b5cdc539c
Change teleports so the TeleportFlags are sent to the destination sim. It
...
can now determine if a connection is from login, teleport or crossing.
Needed for a meaningful banlines implementation
2009-12-29 18:35:06 +00:00
18ca978b81
Give the new user tables the once-over. Strip the current set of methods
...
from IUserAccountService, we need to define what goes in there. Change
the handler to the generic handler. Adjust migrations, add index
2009-12-29 18:31:27 +00:00
e9df86a6d6
* Added useraccount table
2009-12-29 09:22:52 -08:00
a462e440d5
Better way of setting ServiceURLs
2009-12-29 08:06:07 -08:00
f40001f8ed
Added the ServiceURLs field to UserAccountData
2009-12-28 20:53:20 -08:00
3cb68d1c8b
Removed AccountType, GodLevel and UserFlags from UserAccountData. Doesn't belong there.
2009-12-28 20:37:21 -08:00
18d93c2cee
* Added Created field to UserAccountData
2009-12-28 20:29:52 -08:00
c164b85ea6
* Added packing/unpacking of the Home fields in PresenceInfo
...
* Cleaned up IUserService and beefed up UserAccoutData
2009-12-28 20:26:44 -08:00
3249d5be9a
Add the indices to really make this table work
2009-12-28 23:47:58 +00:00
c4f5ac970c
Add a migration to add the 3 new fields
2009-12-28 23:45:15 +00:00
e0fc854f05
Adding new fields and home location methid to presence. Adding cleanup
...
(deleting all but one presence record) on logout so that they don't pile up.
2009-12-28 23:42:08 +00:00
2ed207509b
Add the second step of the friends migration to pull data from the old table into the new
2009-12-28 19:12:33 +00:00
19a7a8f797
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-28 11:46:59 -08:00
43691e8270
Added some more log messages. This is beginning to work.
2009-12-28 11:46:34 -08:00
5b69f58aae
Make Migratons continue int he face of an error. This is required for the
...
friends migration, which MAY error out if the old friends table is not
in the same database as the new one being created. This error is nonfatal,
it would only mean that friends will not be migrated automatically. It would
bite people with nonstandard configurations.
2009-12-28 18:59:38 +00:00
397a296492
Add the migration for friends and guard the presence Report function
2009-12-28 18:52:24 +00:00
9a8f6c79c9
Forgot the migration file
2009-12-28 17:57:45 +00:00
92a40129b5
Database and presence changes. Untested
2009-12-28 17:34:42 +00:00
f43a648052
* Added the new modules to Resources, making them active.
...
* Added their configs to standalone for testing. This crashes, because the DB is still not ready.
2009-12-28 09:22:35 -08:00
531f998ed2
* Deleted HGPresenceBroker, since it won't be needed
...
* Linked the remote presence module to the corresponding remote connector
2009-12-28 07:16:43 -08:00
42122388ef
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 20:35:05 -08:00
3ef513e863
Presence remote connector and handler. Presence HG Broker. Nothing tested, just compiles.
2009-12-27 20:34:42 -08:00
3a953dfc98
This is somewhat major-like..... Change the intialization order of
...
Application plugins so that MainServer.Instance gets assigned before
RegionModulesController loads the new style shared modules. This
is needed because otherwise no new style shared module could
register a HTTP method.... if it breaks, you get to keep both pieces
2009-12-28 01:56:30 +00:00
eebddcd5e6
Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells.
2009-12-28 01:24:15 +00:00
b8dfccb227
Changed GetAgents to take string[] instead of UUID[]
2009-12-27 16:07:16 -08:00
0f5219a004
Allow lists to be embedded in query strings
2009-12-27 21:46:16 +00:00
2f717fc796
Remove the sesion from returned presence info
2009-12-27 18:03:59 +00:00
8ad8bd6282
Fix up the new Sirikata cient view
2009-12-27 17:52:27 +01:00
aa45262c3c
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 08:47:18 -08:00
49d6cfad2b
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 08:40:43 -08:00
2248d2ff32
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2009-12-27 08:38:44 -08:00
ad8ee18090
First pass at the local connector for presence. No cache yet. Just the connector to the local service and a presence detector object.
2009-12-27 08:38:05 -08:00
bca2afdb3c
One should not copy/paste so much :)
2009-12-27 16:08:12 +00:00
045a44b1af
One should not copy/paste so much :)
2009-12-27 16:07:59 +00:00
26599e0906
One should not copy/paste so much :)
2009-12-27 16:07:13 +00:00
d321d23afe
Fix the spelling :/
2009-12-27 16:03:00 +00:00
3ec8e8e40b
Fix the spelling :/
2009-12-27 16:02:31 +00:00
ec4d639a28
Fix the spelling :/
2009-12-27 16:01:36 +00:00
769dad2783
Merge branch 'master' into presence-refactor
2009-12-27 15:49:09 +00:00
e3f60ce06f
Merge branch 'master' into careminster
2009-12-27 15:48:43 +00:00
58ad0ff315
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-27 15:47:58 +00:00
e063f0d592
Encode the published and mature checkboxes into the user flags for
...
profiles
2009-12-27 15:47:14 +00:00
4b96a78039
Merge branch 'master' into casper
2009-12-27 07:11:21 +01:00
19a5e606b3
Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ReaderWriteLockSlim, hopefully fixes a native crash
2009-12-27 07:08:16 +01:00
8a931a4e91
* Implements some basic Sirikata protocol work (initial handshakes).
2009-12-27 16:07:05 +11:00
fd777cc7b9
* Implements Sirikata ClientStack Module
...
* Just a stub (imports all the sirikata protocol, and that's about it.)
2009-12-27 15:03:10 +11:00
9cef5f92a1
Change the signature of the forms requester data in preparation to getting
...
to where lists can be sent as requests
2009-12-27 03:31:53 +00:00
831f759644
Add the MySQL presence data module
2009-12-27 03:05:45 +00:00
8b9332e321
Finish the presence service
2009-12-27 03:00:54 +00:00
490c093636
Just make it compile :)
2009-12-27 02:11:25 +00:00
101f60ea88
Interface changes
2009-12-27 01:54:53 +00:00
dc80d13466
More beef to the IPresenceService interface.
2009-12-26 18:11:13 -08:00
ca3aa283ba
Merge branch 'master' into presence-refactor
2009-12-27 01:28:15 +00:00
982e3ff5d9
Presence Step 1
2009-12-27 01:27:51 +00:00
a18f4964cf
Correct some issues with the last commit
2009-12-27 01:32:23 +01:00
b7951d5177
Correct some issues with the last commit
2009-12-26 23:57:49 +00:00
f5c310d9d4
Merge branch 'master' into careminster
2009-12-26 23:39:02 +00:00
0369256720
Close a SQL injection loophole in the new database driver
2009-12-26 23:38:11 +00:00
a6c93ce875
Make sure that we're not bounds checking attachments. 'Cos otherwise your hair will end up on your bum. Seen that before?
2009-12-26 22:55:18 +01:00
1b8f91a0db
Merge branch 'master' into casper
2009-12-26 18:17:55 +01:00
7371c7662a
Fix for landing points. Only one scenario is not fully covered by this change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
2009-12-26 18:14:12 +01:00
f3a4860635
Merge branch 'master' into careminster
2009-12-26 04:13:27 +00:00
88b3b98811
Add AvatarInterestsReply
2009-12-26 04:12:51 +00:00
43c303e27a
Make the GenericTableHandler work as intended
2009-12-26 03:24:46 +01:00
92be01d5e6
Make the GenericTableHandler work as intended
2009-12-26 01:50:21 +00:00
e51be5f4a7
Merge branch 'master' into careminster
2009-12-26 00:21:03 +00:00
9972b12812
Add a generic REPLACE INTO handler for put into the generic table handler
2009-12-26 00:19:54 +00:00
59f683066a
Set version back to core version (base) and suffix CM. Please DO NOT CHANGE THIS
...
in the repo. This is the Caremninster repo and the number follows CORE. Always.
2009-12-25 23:23:49 +00:00
b19e564317
Restore version suffix.
2009-12-25 23:20:30 +00:00
e881f35fbb
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2009-12-25 23:20:08 +00:00
59a841d69c
Merge branch 'master' into careminster
2009-12-25 23:17:08 +00:00
d5618fbcc3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-25 23:10:44 +00:00
8d36d7beed
Enable the profile module to be replaced completely, even for the base
...
profile data
2009-12-25 23:10:07 +00:00
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
7a06ab834d
Clear Shape.SculptEntry if prim type is not a sculptie in llSetPrimitiveParams() - addresses Mantis #4462
2009-12-24 11:00:08 -08:00
0054afd39b
Merge branch 'master' into careminster
2009-12-24 16:45:27 +00:00
7f699fca9a
Add the body to the LSL List Size property
2009-12-24 18:18:14 +01:00
0ce3d4b0a9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-24 16:44:47 +00:00
86a429bc44
Add the LSL List Size property
2009-12-24 16:44:12 +00:00
2c3d7972b9
No-op in this commit. Just increasing the tag number due to weirdnesses.
2009-12-23 19:43:50 -08:00
1fa938aab0
Library Module: allows adding folders/items to the Library from IAR files placed under bin/Library. This works only for standalones.
2009-12-23 17:31:30 -08:00
908992a105
Fixes the broken build of the previous commit.
2009-12-23 17:10:37 -08:00
e5e951d92c
Merge branch 'master' into careminster
2009-12-24 00:45:53 +00:00
5a653ef96f
Merge branch 'master' into careminster
2009-12-23 23:10:34 +00:00
53386b6f1f
Add saving assets from gestures to IAR
2009-12-23 23:09:41 +00:00
165f193f78
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2009-12-23 21:25:08 +00:00
6eecbc95e4
Merge branch 'master' into careminster
2009-12-23 21:22:19 +00:00
f2d2073f2b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-23 21:21:22 +00:00
c05a35cc71
Fix a bounds exception I came across in IAR restore
2009-12-23 21:20:48 +00:00
c27aa3749c
Change in how the Library returns its descendant folders, so that it includes folders added after the initial load off the file system, by other mechanisms.
2009-12-23 11:45:39 -08:00
fddefff284
Thank you kindly, Ziah for a patch that adds the channel to the class ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts.
...
Signed-off-by: Charles Krinke <cfk@pacbell.net>
2009-12-23 10:34:11 -08:00
9c294c5663
- commented out unused method ConvertIHttpClientContextToOSHttp
2009-12-23 18:33:54 +01:00
a9f4d7a29c
Add a debugger tag to stop Visual Studio from breaking
2009-12-23 17:34:08 +01:00
c54e0953d0
Merge branch 'master' of ssh://TOR/var/git/careminster
2009-12-23 14:15:27 +01:00
b575bf2524
Added some null reference and deleted group checks to certain functions to fix region crash scenarios.
2009-12-23 14:14:20 +01:00
f45a69821b
Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the stream can be closed.
2009-12-22 21:00:46 -08:00
30f59370d3
Merge branch 'master' into careminster
2009-12-22 15:48:41 +00:00
c11f259e15
Remove GetState. It is really unused and was reinstated by the revert
2009-12-22 15:46:55 +00:00
a24d9bff03
Revert "Remove an insterface member that was never used"
...
It was used. By the API, which is dynamically loaded. So it didn't complain
until it hit Bamboo
This reverts commit 33d5018e94
2009-12-22 15:45:56 +00:00
73491cceed
Merge branch 'master' into careminster
2009-12-22 15:37:24 +00:00
33d5018e94
Remove an insterface member that was never used
2009-12-22 15:35:39 +00:00
28c7bb99bf
Merge branch 'master' into careminster
2009-12-22 09:30:50 +00:00
1876ce90af
FINALLY! Script compile errors now appear in the script error pane,
...
not in a funky debug window.
2009-12-22 09:24:01 +00:00
551727cd19
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-22 06:43:31 +01:00
bde26a8282
Add missing file
2009-12-22 06:43:03 +01:00
11c4a2cfd0
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2009-12-22 00:34:06 -05:00
93b930b937
Fix conflicts
2009-12-22 00:33:31 -05:00
b53b871669
Add a data path for error messages
2009-12-22 06:25:32 +01:00
0a29842caf
Include ChOdePlugin
2009-12-22 00:20:04 -05:00
e68c7a1f23
Add missing file
2009-12-22 05:08:15 +00:00
05e8b4e72c
Add a data path for error messages
...
Committed from my other box where git is not configured properly
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-22 04:55:43 +00:00
49fbe0ddb4
Should not commit without compiling
2009-12-22 03:26:47 +01:00
46fea74726
Jumped the gun...
2009-12-22 03:25:09 +01:00
69b551c516
Allow 100ms for scripts to run attach(NULL_KEY) on detach
2009-12-22 03:22:33 +01:00
fa0621b486
Merge branch 'master' into careminster
2009-12-22 00:41:56 +00:00
e530180c1e
Glue code for a couple of new LSL function implementations
2009-12-22 00:26:12 +00:00
84a1a0a729
Merge branch 'master' into careminster
2009-12-21 22:07:22 +00:00
1fe8a1beaf
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-21 22:06:17 +00:00
32904c0ce8
When a script has been loaded, remove it's state entry, so recompiling
...
doesn't pick up the old state again.
2009-12-21 22:05:43 +00:00
dcafb1dfcd
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-12-21 08:55:43 -08:00
4a33ee9fb9
Bug fix: set the map image upon hyperlinking regions.
2009-12-21 08:55:12 -08:00
51ecdf0148
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-21 15:48:46 +00:00
d04f6688e4
Fixes some incorrect values returned by llGetPrimitiveParams() and osGetLinkPrimitiveParams().
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-21 15:48:30 +00:00
641a789bbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-12-21 07:46:33 -08:00
68187f7245
Bug fix: in standalone, HGInventoryBroker needs to get the local inventory server URL from NetworkServersInfo.
2009-12-21 07:44:17 -08:00
b891291135
Merge branch 'master' into careminster
2009-12-21 15:02:57 +00:00
86104cd45c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-12-21 06:59:36 -08:00
c0a8c2e707
Making the library read the item's flag, so that clothing items can have the proper icons.
2009-12-21 06:58:21 -08:00
1e55d74c5c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-21 14:47:40 +00:00
de59910758
Patch from Ziah.
...
Mantis #4456 : Patch to implement some minor MRM Functions : SitTarget,
SitTargetText, TouchText and Text
2009-12-21 14:46:07 +00:00
d8d6e8a304
Merge branch 'master' into casper
2009-12-21 13:29:48 +01:00
e3c1466047
Fixed a nasty crash in StandUp() that occurred when the part got killed with an avatar sitting on it.
2009-12-21 13:22:52 +01:00
df30b1c832
Merge branch 'master' into careminster
2009-12-21 10:28:50 +00:00
27453890d5
Script State Fix: Part 2
...
Change the reader to wrap old-style definitions in new style wrappers.
Change importer to not check irrelevant data that can't be reconstructed
This removes the last bit of knowledge of XEngine's .state files from core.
2009-12-21 10:26:52 +00:00
83d8ba5775
Remove extra checking on the itemID of saved state, since it changes during
...
rez from inventory.
2009-12-21 06:41:10 +00:00
f6ef487413
Script State Fix: Step 1
...
Add Engine=xxx attribute and check for it's presence. Ignore state data
written bby another engine
2009-12-21 06:29:23 +00:00
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
37b07aa9ec
Fix a case where an idle sim can eat 100% of a core
2009-12-20 16:44:31 +00:00
c7a457f9ee
Merge branch 'casper'
2009-12-20 16:20:48 +01:00
31bf25d05e
Reverted my changes to jhurliman's packet stack since it currently causes more problems than it resolves. The stack DOES need a rework particularly with regards to priorities, but this is not it.
2009-12-20 16:18:43 +01:00
eecaa3d9dd
Merge branch 'tests'
2009-12-19 20:00:00 -05:00
e38e8ae987
Fix mantis #10 & #14
2009-12-19 19:54:44 -05:00
26e3a8ee4b
* Bug fix in HG: preserve the home region coordinates across multiple HG TPs.
...
* Removed unnecessary debug messages.
2009-12-19 10:16:07 -08:00
6dbe25360e
Add cmSetWindlightSceneTargeted. Add restrictions on windlight script use.
2009-12-17 18:40:34 +01:00
6483470ec5
Fix GetWorldRotation(), and a host of related Sit fixes.
2009-12-17 02:54:02 -05:00
83fad75e22
Merge branch 'tests'
2009-12-16 18:59:46 -05:00
9485f17bf9
random drive-by minor math optimization. No need for concern, bitshed was within acceptable limits
2009-12-15 19:12:24 -08:00
7cd44c1a81
Fix prim linking bug, Manis #14
2009-12-15 20:04:53 -05:00
6bd087a8f9
minor: remove some mono compiler warnings
2009-12-15 16:42:42 +00:00
87e9062862
Make sure that we catch and display any exceptions that get right to the top of our incoming http request handling stack
2009-12-15 16:34:27 +00:00
00365fff02
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-12-15 16:24:29 +00:00
57d60a95a2
minor: make logging messages consistent in BaseHttpServer
2009-12-15 16:23:57 +00:00
f8b6bc8d11
Merge branch 'master' into careminster
2009-12-15 15:46:18 +00:00
9aea69a549
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-15 15:43:42 +00:00
0f616d2ffe
Prevent OSSL from crashing if the sim was loaded from a remote config and
...
osGetGridName, osGetGridNick or osGetGridLoginURI is used.
2009-12-15 15:42:51 +00:00
ffff12f7c1
Change default grid and inventory service ports in ConfigSettings to the ROBUST default of 8003
2009-12-15 15:37:03 +00:00
0020afaf67
Merge branch 'master' into tests
2009-12-15 06:01:59 -05:00
b8b4517211
Removed excessive call to UpdateMovementAnimations which prevented GroundSit; Corrected cause of 'sit on roof'.
2009-12-15 01:49:23 -05:00
9e54e61a43
Make the HG map search recognize host names without ports.
2009-12-14 08:27:16 -08:00
824d7190c2
Merge branch 'master' into careminster
2009-12-14 00:40:56 +00:00
0813dc8c1d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-14 00:32:00 +00:00
c426549f53
Add an option to exit an instance rather than restarting a region within it
2009-12-14 00:31:15 +00:00
f046457249
Tweaking the ModifyLand packet to be async. Advice from Adam
2009-12-13 04:02:18 -05:00
4ef8dc7d96
* Add some glue that allows LocalPacketHandlers to decide if they want the packet to be processed asynchronously or not.
...
* Make several packets not asynchronous (such as AgentUpdate). In theory, all fast returning packet handling methods should not be asynchronous. Ones that wait on an external resource or a long held lock, should be asynchronous.
2009-12-13 02:08:28 -05:00
87e89efbf9
* Mistaken ThreatLevel classification on osGetSimulatorMemory - should have been MODERATE.
2009-12-13 03:49:22 +11:00
963cf25813
* Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
...
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
2009-12-13 03:04:16 +11:00
30d64444a0
And reverse
2009-12-12 16:01:53 +00:00
9904700dfd
Another whitespace test commit
2009-12-12 16:00:44 +00:00
b056c243e4
Commit partial work because of repo change
2009-12-12 10:12:59 -05:00
c00158b238
Reverse test commit (again)
2009-12-12 14:35:12 +00:00
794419852b
Another test
2009-12-12 14:23:20 +00:00
fbafd22124
Reverse text commit whitespace change
2009-12-12 13:43:49 +00:00
b9cd66d510
test commit
2009-12-12 13:33:45 +00:00
b310efc50f
Merge branch 'master' into careminster
2009-12-12 12:54:43 +00:00
0639e90f56
* Bugfix mantis 4441, "Use of Autopilot isn't playing any animations."
...
* Turns out the new animator used a different movement bitflag then the one used in the code to autopilot the avatar
2009-12-12 02:41:59 -05:00
35961caec6
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-12-12 01:24:25 -05:00
0fdf883cbd
Merge branch 'master' into careminster
2009-12-12 04:56:28 +00:00
d89f3e9811
Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:44:32 +00:00
1382dc976c
Merge branch 'master' into careminster
2009-12-12 04:14:47 +00:00
83ca7db4b8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-12 04:14:12 +00:00
81debdfebe
A few more guards along the path to user server.
2009-12-11 20:20:18 -08:00
62ec60ca76
Getting rid of a bunch of old classes, that are likely left over from the ROBUST change.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-12 04:13:39 +00:00
d20fe7bfdd
A couple of more sanity guards, but this won't fix things when user profile fetching is borked.
2009-12-11 20:06:42 -08:00
4bbe9a51ac
Added an image uuid to objects marked "Show in search". Only works for boxes.
2009-12-11 09:09:36 -08:00
5f0478c4c4
Fix to make [bad] tests happy.
2009-12-11 08:28:24 -08:00
decd51f081
Attempt at fixing mantis #4411 .
2009-12-11 08:11:26 -08:00
54e4dcf454
Merge branch 'master' into careminster
2009-12-11 02:49:41 +00:00
204c59c5ac
Refix the fix
2009-12-11 02:42:05 +00:00
d68b664243
Kill a NRE caused by an error message trying to print unavailable data
2009-12-11 02:42:00 +00:00
f6b1344722
Refix the fix
2009-12-11 02:40:33 +00:00
5ffd59e7b8
Kill a NRE caused by an error message trying to print unavailable data
2009-12-10 22:09:16 -05:00
6d7c10b2b4
* Diagnosing a connection issue.
2009-12-11 13:19:32 +11:00
0889b5aef1
Fix version number
2009-12-10 18:20:40 +00:00
59ca92b10b
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-12-10 18:17:29 +00:00
a6a6bf007a
Move osFunctions into a new Careminster script interface
2009-12-09 23:28:00 +01:00
2a6dbd068e
Last bits and bobs to clean up the Meta7WindlightModule
2009-12-09 03:58:56 +01:00
d092977f4a
Windlight configuration option in ini, and migration
2009-12-09 01:53:41 +01:00
e3f229225c
Enable scripting interface for windlight
2009-12-09 01:34:26 +01:00
2f8b9cbf2b
* Commit some sit code that's commented out for now.
2009-12-08 11:28:13 -05:00
ee9d46c825
Correct AbsolutePosition calculation
2009-12-08 05:49:05 +01:00
dbd8c400ce
Merge branch 'careminster' into windlight
2009-12-07 18:14:02 +01:00
29a740ec8c
Initial windlight codebase commit
2009-12-07 18:05:40 +01:00
dd5696e8bd
Same for the remote auth connector
2009-12-07 14:31:55 +00:00
c2d3afdeee
Same for the remote auth connector
2009-12-07 14:31:20 +00:00
9155c9ee37
Merge branch 'master' into careminster
2009-12-07 14:14:00 +00:00
ad2c23d507
Stop AuthorizationService from throwing an error if it's not configured.
...
Optional services should not cause red spew when they're not wanted
2009-12-07 14:12:53 +00:00
0d1d437bd3
Fix linked physical daughter prim position update.
2009-12-06 21:11:59 +01:00
172e2f4e76
Fix to existing ReaderWriterLockSlim implementations
2009-12-06 17:23:07 +01:00
4c61fcfc40
Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
...
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-06 03:57:15 +00:00
1e222d52e6
Change EntityManager to use RWlocks
2009-12-06 03:56:15 +00:00
f9ae9afaac
Fix build break from conflicted merge
2009-12-06 03:10:34 +00:00
09bbfc1d56
Merge branch 'master' into careminster
2009-12-06 03:01:58 +00:00
a44749b9d2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-12-06 02:54:47 +00:00
8d196dbd14
* Adds Normal to the fields returned by the Physics Raycaster
...
* Fixes recognizing when a sit target is and isn't set.
* * 1. Vector3.Zero.
* * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION
* * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion
* * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it
2009-12-05 22:18:00 -05:00
9453c42631
Experimental: Remove explicit property sends
2009-12-06 02:54:19 +00:00
1a695875a7
Skip single prims in unlink selections
2009-12-06 02:54:09 +00:00
f71025aeed
Change locking to not mix explicit Monitor.* calls with lock()
2009-12-06 02:54:00 +00:00
5259a32319
Remove extra forced updates. They're not needed for each prim. Really.
2009-12-06 02:53:50 +00:00
46d5add175
Lock updates out while linking and unlinking
2009-12-06 02:53:42 +00:00
e3a22ff37d
Eliminate multiple updates on link/unlink
2009-12-06 02:53:34 +00:00
f8cc409034
Cause better packing of ObjectProperties
2009-12-06 02:53:24 +00:00
79511ecce2
Experimental: Remove explicit property sends
2009-12-06 02:15:52 +00:00
2fe75a62be
Skip single prims in unlink selections
2009-12-06 02:00:32 +00:00
da414fd509
Change locking to not mix explicit Monitor.* calls with lock()
2009-12-06 01:20:39 +00:00
f2891e7738
Remove extra forced updates. They're not needed for each prim. Really.
2009-12-06 00:50:28 +00:00
fbefa8273b
Lock updates out while linking and unlinking
2009-12-06 00:25:04 +00:00
ceccfe02d0
Eliminate multiple updates on link/unlink
2009-12-06 00:02:24 +00:00
129de26032
Cause better packing of ObjectProperties
2009-12-05 23:25:30 +00:00
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
8e089b6d8d
* Fix line endings in BaseHttpServer.cs
2009-12-05 13:23:05 -05:00
c4b6010fb3
* Fixes mantis 4416. Animator is dereferenced on logout
2009-12-05 13:01:21 -05:00
cc8246206d
Secnond revision of Sit and Stand for unscripted prims; Comment out
...
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
c0f3a4c833
Allow terrain heightmaps to be loaded directly from URIs via the remote admin plugin
...
See http://opensimulator.org/mantis/view.php?id=4418
Thanks StrawberryFride
See
2009-12-04 18:26:58 +00:00
675d04dd5d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-12-03 20:22:38 -05:00
781db43a76
* Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)])
...
* Adds a configurable maximum object mass before the mass is clamped. Default is 10000.01. Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section.
* Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations. Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
2009-12-03 20:21:10 -05:00
504bfd87d5
if an xml rpc method throws an exception, log as an error to the console as well as returning the exception to the caller
2009-12-03 18:05:42 +00:00
d9a20edfb0
* Move code from that last commit to LLClientView since it's a linden client specific limitation, it moves to the Linden Specific client handler.
2009-12-03 02:02:04 -05:00
af04cd1ae0
* If the position that comes in on Scene.SetHomeRezPoint has a component that is 255.5, replace the component with the user's position in the simulator.
...
* Fixes mantis 4414: http://opensimulator.org/mantis/view.php?id=4414
2009-12-03 01:50:54 -05:00
c58d30616b
Log old position and region information when an orphaned child prim is found
2009-12-02 18:54:24 +00:00
f7b2f0e61e
Add position and region of prim items with missing assets in log reports
2009-12-02 18:15:33 +00:00
30fe88b808
* Terrain uploads via the Estate Tools now support a multitude of file formats. Specifically: . bmp, .raw, .r32 & .r64. (in ascending order of precision)
...
* It uses file length as the detection routine (as each of these formats has a distinct size in bytes for a 256x256 array.) - more formats should be possible to add.
2009-12-03 02:44:12 +11:00
4234c64147
handle a condition where the http headers apparently have multiple remote ports designated
2009-12-02 04:10:53 -08:00
551696bb45
Merge branch 'master' into careminster
2009-12-02 10:22:21 +00:00
5ee79c62bf
Change default destination of deleted items to the trash folder. Everything
...
else still goes to L&F
2009-12-02 10:21:24 +00:00
ded16d3529
Merge branch 'master' into careminster
2009-12-02 00:36:53 +00:00
d2c1610d17
* Test Autoconvert line ending on my repo..
2009-12-01 11:35:32 -05:00
75e28b3a16
* Fix Inconsistent line ending style on Scene
2009-12-01 10:48:11 -05:00
7a2e8cb05f
* Fix Inconsistent line ending style on ScenePresenceAnimator
2009-12-01 10:47:18 -05:00
56dca3b5a4
* Fix Inconsistent line ending style on SimStatsReporter
2009-12-01 10:45:36 -05:00
4af77e84b1
* Fix Inconsistent line ending style in Util
2009-12-01 10:21:22 -05:00
d4073d9bd5
* Fix Inconsistent line ending style in LLUDPClient
2009-12-01 10:19:39 -05:00
475d23741d
* Fix Inconsistent line ending style in ScenePresence
2009-12-01 10:17:17 -05:00
2e6dce434f
Enforce physical prim max size on single prims.
...
Also convert a lock() to ReaderWriterLockSlim that i missed in the last commit
2009-11-30 21:52:55 +01:00
9888f95068
Convert multiple lock()s which directly hinder script performance in linksets to ReaderWriterLockSlim.
2009-11-30 21:17:15 +01:00
83694e5578
* Add a close method to the ScenePresenceAnimator that dereferences the class variables and make the ScenePresence Close method call it.
2009-11-30 14:03:20 -05:00
0cb4ff1b68
* Modified ScenePresence to use the Util version of the EnvironmentTickCount method (and it's subtract method). Remove redundant EnvironmentTickCount definitions in ScenePresence.
2009-11-30 13:53:43 -05:00
8bbb88ea4e
Merge branch 'master' into careminster
2009-11-30 14:16:42 +00:00
9549a06ead
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-30 14:15:32 +00:00
984d5b0de6
Add "shutdown" command to ROBUST shell
2009-11-30 14:15:00 +00:00
5b0bb1eff9
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
2009-11-30 01:09:46 -08:00
e987e85c0c
add agent position to output of "show users" console command
2009-11-30 01:09:03 -08:00
69d83e1548
Merge branch 'master' into careminster
2009-11-30 08:25:40 +00:00
4338f4e1d7
* Patch from Misterblue to fix Environment.TickCount for statistics purposes. Resolves the wrap-around of the 32 bit uint.
...
* Teravus moved the Environment methods to the Util class
2009-11-29 05:06:25 -05:00
d3e7a52933
Merge branch 'master' into careminster
2009-11-28 09:26:00 +00:00
9fd9211a38
Add some conditionals to references to the WorldComm module, so that the
...
module can be disabled without crashing the sim
2009-11-28 09:23:26 +00:00
e7333515d9
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-27 19:17:54 -05:00
8296413add
* Re-enable lightweight packet tracking stats on a 3000 ms interval.
2009-11-27 19:17:36 -05:00
3e4000b9d9
Rename TestAssetDataPlugin to MockAssetDataPlugin
2009-11-27 19:56:06 +00:00
66f511c76a
Remove unused GetDefaultAppearance() static function that is also available on AvatarFactoryModule
2009-11-27 19:45:33 +00:00
e5661e5609
Remove stub Python module and DLLs since this was never fully implemented
...
It may be possible to reintroduce this if someone wants to implement a Python hookup for OpenSim scripting (I'm sure it can't be too hard).
Might be possible to import wholesale from modrex
See http://opensimulator.org/mantis/view.php?id=4395
Thanks mpallari
2009-11-27 19:31:19 +00:00
55a0896918
minor: remove mono compiler warning
2009-11-27 19:28:26 +00:00
e078fb2e71
Implement god mode user freezing and unfreezing
...
See http://opensimulator.org/mantis/view.php?id=4356
Thanks Revolution
I performed a subsequent probable bug fix in this patch
2009-11-27 19:23:51 +00:00
2e47e51475
Make locking of timers and listeners in script related functions consistent
...
See http://opensimulator.org/mantis/view.php?id=4316
Thanks KittyLiu!
2009-11-27 19:01:45 +00:00
0f745e928f
Apply patch that fixes the failing T013_eStateSettingsRandomStorage test
...
See http://opensimulator.org/mantis/view.php?id=3993
Thanks Kunnis
2009-11-27 18:52:20 +00:00
251fd8c948
Apply patch to reduce git revision text length if running sim directly from a git tree
...
See http://opensimulator.org/mantis/view.php?id=4030
Thanks ChrisDown (and Bruce for reporting)
2009-11-27 18:24:21 +00:00
25e2b16451
Apply patch to stop failure of llParcelMediaCommandList() on group deeded land
...
See http://opensimulator.org/mantis/view.php?id=3999
2009-11-27 17:52:23 +00:00
32ef1b9e23
remove stringent content type checking to make it easier to load oars directly from urls
2009-11-27 15:10:12 +00:00
1f71523a5a
minor: make irc bridge logging less verbose if it isn't actually enabled
2009-11-27 14:47:49 +00:00
b9eb244d6d
Reset update flag when a SOG is deleted. This fixes llDie();
2009-11-27 08:59:03 +00:00
aa695e92f7
Reset update flag when a SOG is deleted. This fixes llDie();
2009-11-27 08:58:26 +00:00
0ddd1ce0b7
Merge branch 'master' into careminster
2009-11-27 08:18:16 +00:00
3ae3cd0a5b
Make llDie virtual, since it's functionality is engine specific
2009-11-27 08:16:47 +00:00
cc18ab12f8
Merge branch 'master' into careminster
2009-11-27 00:40:56 +00:00
f84da8e642
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-26 17:03:19 -05:00
e2200026ca
* Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in linkset where EnableBody was called and the body is immediately disabled. The previous functionality assumed that a body was received in EnableBody but.. in some cases, it wasn't.
2009-11-26 17:03:00 -05:00
2c3f6aaa87
Merge branch 'careminster' into tests
2009-11-26 20:41:38 +01:00
5dedacca3c
First attempt at mult-sit on large single prims.
2009-11-26 20:37:08 +01:00
ad2f0a1290
Remove OS version crap from about dialog
2009-11-26 18:04:58 +00:00
bd3b9f79c2
Update CM version
2009-11-26 17:59:28 +00:00
ed148eba32
Merge branch 'master' into careminster
2009-11-26 17:45:09 +00:00
58aad366dd
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-26 17:44:15 +00:00
377bc27c1f
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-26 19:02:41 +00:00
52dc9ec003
Bump trunk version number to 0.6.9.
...
This is a place holder name and not necessarily the version number that will be used
2009-11-26 19:00:57 +00:00
9d05962029
Added osGetRegionStats() function, to return a number of sim statistics
2009-11-26 17:43:17 +00:00
d39c300d11
Added osGetRegionStats() function, to return a number of sim statistics
2009-11-26 17:43:00 +00:00
06f41bb017
Merge branch 'master' into careminster
2009-11-26 17:27:03 +00:00
c6bfecccaa
Fix a small bug. Trusted script crossings now work again
2009-11-26 17:16:22 +00:00
41226dc991
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-26 17:05:48 +00:00
9d63f90467
Remove the old (Remoting) region crossing code. Fix the new code to
...
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
ee0b5abc62
minor: reduce region ready logging verbosity
2009-11-26 16:51:10 +00:00
2bc19a1e23
Resolve issue where an iar load fails to preserve original item creators
...
See http://opensimulator.org/mantis/view.php?id=4394
This change preserves the uuid when a profile is found rather than the ospa
2009-11-26 16:39:30 +00:00
a27d33cb63
Remove the old remoting-type interregion code for prim/script crossing
2009-11-26 13:13:56 +00:00
22c325aa5a
Remove GetAssemblyName and friends from the SE interface. It's now handled
...
internally
2009-11-26 13:13:48 +00:00
ac2fcbe224
Improvements to rAdmin admin_shutdown and admin_restart. Both methods can now accept a parameter of noticetype = dialog in order to display a blue persistant dropdown instead of a short notice. Added an optional and configurable delay to the restart method, defaulting at 30 seconds as before. Both methods can also accept a noticetype = none dialog in order to act silently.
2009-11-26 15:17:44 +01:00
05fc504ff3
Remove the old remoting-type interregion code for prim/script crossing
2009-11-26 12:16:42 +00:00
88842edc95
Remove GetAssemblyName and friends from the SE interface. It's now handled
...
internally
2009-11-26 12:08:20 +00:00
a5f2803c79
* Re-enable the AbsolutePosition = AbsolutePosition in the LSL_Api in the SetRot method if the object is not active physical. This is important for scripted rotating doors. without AbsolutePosition = AbsolutePosition, the door won't rotate. It's also important that we do not use AbsolutePosition = AbsolutePosition if the object is active physical because that would cause a complete rebuild of the object which would break vehicles. This is the best of both worlds right now. Doors as child prim should work again so long as you don't check the Physical box.
...
* Thanks talentraspel
* Thanks NixNerd
* Thanks KittoFlora
* Thanks lockd
2009-11-26 01:34:46 -05:00
63b6b9cdce
Added animation support for my last commit
2009-11-26 02:35:27 +01:00
de55110247
Merge branch 'careminster' into casper
2009-11-26 02:01:51 +01:00
b9d22aa821
Add nudge right and left to avatar movement (faster reaction times when stepping left or right.)
2009-11-26 01:59:08 +01:00
de927adf27
Add the dummy "Size" property to the list type
2009-11-25 20:01:21 +00:00
dac9c6fb23
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-25 14:13:51 -05:00
a3755d831d
Patch: Fix a bug in LAND animation when the TickCount wraps into negative numbers
...
by Mic Bowman
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2009-11-25 14:13:29 -05:00
79395bc7db
Merge branch 'master' into careminster
2009-11-25 17:04:05 +00:00
cc3617f74f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-25 17:03:11 +00:00
59caa68e08
minor: add doc to a few parcel methods
2009-11-25 17:49:38 +00:00
0b380f68d8
Change osTeleportAgent parameters from long to int. That numerical range is
...
not even supported by the underlying type, so there is no need to ask
for a type the script can not even supply.
2009-11-25 17:02:45 +00:00
c81f37cf82
Change osTeleportAgent parameters from long to int. That numerical range is
...
not even supported by the underlying type, so there is no need to ask
for a type the script can not even supply.
2009-11-25 17:01:41 +00:00
40464f6cc6
Change chat config code so that enabled = false actually does disable the chat module
2009-11-25 16:23:37 +00:00
a4d2a97bc6
minor: remove some mono compiler warnings, add --merge load oar switch to help information
2009-11-25 16:14:08 +00:00
c18422ad3a
Implement oar merging
...
An oar can now be merged with existing region contents by using the --merge option
For example, load oar --merge my.oar
Existing terrain, region settings and parcel data is left in place when an oar is merged.
See http://opensimulator.org/wiki/OpenSim_Archives#Usage for more information
2009-11-25 16:02:47 +00:00
f9807884a4
Add MIT/X11 licensed NDesk.Options ( http://www.ndesk.org/Options ) DLL to aid command line parsing
2009-11-25 15:28:43 +00:00
a642968fd5
* Reverting last commit.. because it just made it worse.
2009-11-25 04:00:52 -05:00
25b4160434
Merge branch 'master' into careminster
2009-11-25 08:45:41 +00:00
Melanie