9be2d5c77d
Fix merge issues
2012-10-07 03:03:24 +01:00
f7df68d922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 02:48:28 +01:00
7e1eecdf73
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-07 02:22:28 +02:00
78ce7a0a04
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
2012-10-07 01:20:52 +01:00
13c4fd7271
refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents
2012-10-06 04:06:27 +01:00
9de991301c
Make UserSessionID a class rather than a struct, so that later updates to value suceed (rather than having to pull the data out and reinsert back into the Dictionary).
...
Fixes http://opensimulator.org/mantis/view.php?id=6338
2012-10-06 04:04:50 +01:00
16c9c1dff7
On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates.
...
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
2012-10-06 02:34:49 +01:00
91ca3117cb
Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full update. There should be a better way to indicate which properties have changed that is non LLUDP-centric
2012-10-05 17:32:07 -07:00
6f220a8679
Trigger ObjectAddedToScene when loading objects from oarfile. Already triggers when creating, duplicating or loading from database, incoming attachments, etc
2012-10-05 17:30:27 -07:00
ceb33b24f7
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-05 07:04:58 +02:00
5254c0de8f
Merge branch 'avination' into ubitwork
2012-10-05 06:00:45 +01:00
1fb53e7103
Fix bug in implementation of "show part pos" that would not filter probably.
...
Also refactors more of ObjectCommandsModule to remove duplicate code
2012-10-05 04:31:43 +01:00
22f6fa49e3
Add "show part pos" console command to match "show object pos"
2012-10-05 04:22:08 +01:00
16feed456a
refactor: eliminate some now duplicate code in ObjectCommandsModule
2012-10-05 04:16:38 +01:00
68859af3f8
Add Vector3.Zero return on TryParseConsoleVector() which fails on mono 2.4.3 but not mono 2.10.9
2012-10-05 03:58:52 +01:00
633e1ed62c
Add missing ConsoleUtil from last commit
2012-10-05 03:57:35 +01:00
130768b16a
Add "show object pos <start-coord> to <end-coord>" command to simulator console.
...
This allows you to display details of all objects in a given bounding box.
Values parts of the co-ord can be left out as appropriate (e.g. to get all objects between the ground and z=30.
See "help show object pos" for more details.
2012-10-05 03:52:42 +01:00
8cd1dc8d60
minor: Add missing license information from the top of IUserManagement
2012-10-05 02:07:28 +01:00
d87813a194
Finally fix build break by allowing UserManagementModule (which constructs a packet directly) to reference OpenSim.Region.ClientStack.LindenUDP.
...
This time I actually properly did a clean build
2012-10-05 02:02:19 +01:00
046113c137
Print number of objects found with "show object name" and "show part name" simulator console commands
2012-10-05 01:46:28 +01:00
03136df1a7
Forgot to actually remove the packetpool set code from scene.
2012-10-05 01:45:49 +01:00
7c7cdf3431
Read PacketPool config in LLUDPServer with other config params rather than in Scene.
...
This is to resolve previous build break.
This unnecessarily but harmlessly reads and sets the parameter multiple times - scene was doing the same thing.
2012-10-05 01:43:29 +01:00
4832ed6960
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-05 01:32:02 +01:00
f0178a6a41
refactor: Move OpenSim.Framework.PacketPool to OpenSim.Region.Clientstack.Linden.UDP
...
This is to allow it to use OpenSim.Framework.Monitoring in the future.
This is also a better location since the packet pool is linden udp specific
2012-10-05 01:12:56 +01:00
db00402fa8
make sure a buffer is closed, and changed a misleading log msg
2012-10-05 00:14:49 +01:00
276fdbc1b3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-04 15:33:17 -07:00
5b90f5bb17
One more abstraction for GridUser so that it can be overridden in a sub-class.
2012-10-04 15:32:49 -07:00
d5ea203f93
Fix threading in remote asset connector
2012-10-05 00:15:55 +02:00
637e9a10db
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-10-04 20:16:23 +01:00
d98af79f77
Make the asset retrieval concurrency a config switch. The current value
...
of 30 is still hanging badly on some mono versions. The switch defaults to
30 to preserve current behavior.
2012-10-04 08:41:06 -07:00
b977f962fa
Allow default animation to be stopped to be replaced with another one.
...
Fixes Mantis #6327
2012-10-04 15:42:52 +01:00
efb9b7014e
Allow default animation to be stopped to be replaced with another one.
...
Fixes Mantis #6327
2012-10-04 15:20:04 +02:00
717802ab09
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 09:16:21 +02:00
89d342b5ce
more changes and more non active code
2012-10-04 08:14:52 +01:00
840d56dcec
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 06:30:51 +02:00
113549c2e9
apply cmic fix to multi layer wearables
2012-10-04 05:29:32 +01:00
fa5fd77823
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 06:06:21 +02:00
893b44497d
Merge branch 'avination' into ubitwork
2012-10-04 05:05:57 +01:00
5bf8c54207
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 05:59:03 +02:00
51e1830f86
more changes. Most code not in use
2012-10-04 04:55:53 +01:00
aa52c8b20f
Output monitor data in response to console command on MainConsole.Instance rather than m_log
...
This should really be happening for all console commands (though many don't).
However, things might get difficult if both a console command and other code invoke the same paths.
2012-10-04 02:17:57 +01:00
3d36a6d55c
Add generic PercentageStat.
...
Not yet used.
2012-10-04 01:27:40 +01:00
e717398f6c
Add experimental "slow frames" stat, available in "show stats" and via the monitoring module.
...
This increments a SlowFrames counter if a frame takes over 120% of maximum time.
This commit also introduces a generic OpenSim.Framework.Monitoring.Stat which is available to any code that wants to register a statistic.
This is more granualar than asking objects to create their own reports.
At some point this will supersede earlier IMonitor and IAlert facilities in MonitoringModule which are only available to scene code.
2012-10-04 00:32:42 +01:00
a2ab3b88de
Soliciting for comments on smoothness of physics objects for this build.
...
This introduces expected contact point hints to the ODE Collider to better determine when to throttle updates as excessive. This /should/ smooth physics objects out again, however, I cannot know every configuration of OpenSimulator, so I'm requesting that testers please examine this change on their build.
Thanks!
2012-10-03 18:30:44 -04:00
57bfd38e2a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 00:18:57 +02:00
a9f2bc150f
missing changed file
2012-10-03 23:18:35 +01:00
d657c48abf
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-04 00:17:19 +02:00
9988558ec1
meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabled
...
for all physics engines)
2012-10-03 23:14:56 +01:00
33b2096c5f
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-03 21:38:35 +02:00
4f51cc325c
making meshworker have more work..
2012-10-03 20:36:41 +01:00
Melanie